qt5: adapt to C++20 API changes

Issue #5227 Issue #5239
2025-02-20 09:46:20 +00:00 · 2024-06-07 17:26:47 +02:00 · 2024-06-07 17:26:47 +02:00 · 06d098052f
commit 06d098052f
parent 4969c7cdb0
9 changed files with 8 additions and 5 deletions
--- a/repos/gems/src/app/mixer_gui_qt/mixer_gui_qt.pro
+++ b/repos/gems/src/app/mixer_gui_qt/mixer_gui_qt.pro
@ -1,6 +1,6 @@
 QT       += core gui widgets
 TEMPLATE  = app
-
+CONFIG   += c++2a
 SOURCES  += main.cpp \
            main_window.cpp
 HEADERS  += main_window.h
--- a/repos/gems/src/test/tiled_wm/app/app.pro
+++ b/repos/gems/src/test/tiled_wm/app/app.pro
@ -1,6 +1,7 @@
 TEMPLATE   = app
 TARGET     = test-tiled_wm-app
 QT         = core gui widgets
+CONFIG    += c++2a
 SOURCES   += main.cpp app.cpp
 HEADERS   += app.h ../util.h
 RESOURCES  = app.qrc
--- a/repos/gems/src/test/tiled_wm/overlay/overlay.pro
+++ b/repos/gems/src/test/tiled_wm/overlay/overlay.pro
@ -1,6 +1,7 @@
 TEMPLATE   = app
 TARGET     = test-tiled_wm-overlay
 QT         = core gui widgets
+CONFIG    += c++2a
 SOURCES   += main.cpp overlay.cpp
 HEADERS   += overlay.h ../util.h
 RESOURCES  = overlay.qrc
--- a/repos/gems/src/test/tiled_wm/panel/panel.pro
+++ b/repos/gems/src/test/tiled_wm/panel/panel.pro
@ -1,6 +1,7 @@
 TEMPLATE   = app
 TARGET     = test-tiled_wm-panel
 QT         = core gui widgets
+CONFIG    += c++2a
 SOURCES   += main.cpp panel.cpp
 HEADERS   += panel.h icon.h ../util.h
 RESOURCES  = panel.qrc
--- a/repos/libports/lib/import/import-qt5_qmake.mk
+++ b/repos/libports/lib/import/import-qt5_qmake.mk
@ -50,7 +50,6 @@ GENODE_QMAKE_CFLAGS = \
 	-D__GENODE__ \
 	-ffunction-sections \
 	-fno-strict-aliasing \
-	-fconcepts \
 	$(CC_OPT_NOSTDINC) \
 	$(CC_MARCH) \
 	$(CC_OPT_PIC) \
--- a/repos/libports/ports/qt5.hash
+++ b/repos/libports/ports/qt5.hash
@ -1 +1 @@
-0bf1a25e14bf04d6b6d8c4ecca3f611a8a9f364d
+dd140ccae2f56656b4d9403156699a227d03c5c7
--- a/repos/libports/ports/qt5.port
+++ b/repos/libports/ports/qt5.port
@ -4,5 +4,5 @@ VERSION := 5.15.2
 DOWNLOADS := qt5.git

 URL(qt5) := https://github.com/cproc/qt5.git
-REV(qt5) := issue5205
+REV(qt5) := issue5239
 DIR(qt5) := src/lib/qt5
--- a/repos/libports/src/app/qt5/qt_launchpad/qt_launchpad.pro
+++ b/repos/libports/src/app/qt5/qt_launchpad/qt_launchpad.pro
@ -1,6 +1,7 @@
 TEMPLATE   = app
 TARGET     = qt_launchpad
 QT         = core gui widgets
+CONFIG    += c++2a
 HEADERS   += child_entry.h \
             kbyte_loadbar.h \
             launch_entry.h \
--- a/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro
+++ b/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro
@ -1,5 +1,5 @@
 TEMPLATE = lib
-CONFIG += plugin
+CONFIG += plugin c++2a
 QT = core gui gui_private widgets
 HEADERS = qmake_root/include/qgenodeviewwidget/qgenodeviewwidget.h
 SOURCES = qgenodeviewwidget.cpp