From 06d098052f0d1d26f99c9349d36fdb7d6a90b3b6 Mon Sep 17 00:00:00 2001 From: Christian Prochaska Date: Fri, 7 Jun 2024 17:26:47 +0200 Subject: [PATCH] qt5: adapt to C++20 API changes Issue #5227 Issue #5239 --- repos/gems/src/app/mixer_gui_qt/mixer_gui_qt.pro | 2 +- repos/gems/src/test/tiled_wm/app/app.pro | 1 + repos/gems/src/test/tiled_wm/overlay/overlay.pro | 1 + repos/gems/src/test/tiled_wm/panel/panel.pro | 1 + repos/libports/lib/import/import-qt5_qmake.mk | 1 - repos/libports/ports/qt5.hash | 2 +- repos/libports/ports/qt5.port | 2 +- repos/libports/src/app/qt5/qt_launchpad/qt_launchpad.pro | 1 + repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro | 2 +- 9 files changed, 8 insertions(+), 5 deletions(-) diff --git a/repos/gems/src/app/mixer_gui_qt/mixer_gui_qt.pro b/repos/gems/src/app/mixer_gui_qt/mixer_gui_qt.pro index ae99977e51..0a65816850 100644 --- 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 diff --git a/repos/gems/src/test/tiled_wm/app/app.pro b/repos/gems/src/test/tiled_wm/app/app.pro index 70756a5000..0953a7bf26 100644 --- 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 diff --git a/repos/gems/src/test/tiled_wm/overlay/overlay.pro b/repos/gems/src/test/tiled_wm/overlay/overlay.pro index 2635ce4a9e..5f06b5e8ea 100644 --- 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 diff --git a/repos/gems/src/test/tiled_wm/panel/panel.pro b/repos/gems/src/test/tiled_wm/panel/panel.pro index 3ec8f3f594..40b1fe3d5a 100644 --- 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 diff --git a/repos/libports/lib/import/import-qt5_qmake.mk b/repos/libports/lib/import/import-qt5_qmake.mk index 0c84c2835c..22a3963334 100644 --- 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) \ diff --git a/repos/libports/ports/qt5.hash b/repos/libports/ports/qt5.hash index 20e4612b76..4a6a69c6b8 100644 --- a/repos/libports/ports/qt5.hash +++ b/repos/libports/ports/qt5.hash @@ -1 +1 @@ -0bf1a25e14bf04d6b6d8c4ecca3f611a8a9f364d +dd140ccae2f56656b4d9403156699a227d03c5c7 diff --git a/repos/libports/ports/qt5.port b/repos/libports/ports/qt5.port index 28ec32acf6..2a29f4a694 100644 --- 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 diff --git a/repos/libports/src/app/qt5/qt_launchpad/qt_launchpad.pro b/repos/libports/src/app/qt5/qt_launchpad/qt_launchpad.pro index a456dd8f59..4110e3378c 100644 --- 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 \ diff --git a/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro b/repos/libports/src/lib/qgenodeviewwidget/qgenodeviewwidget.pro index e9135623bf..65e0262bca 100644 --- 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