kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Qt6: fix possible build failure

Browse Source 
* add CMake definitions 'QT_NO_KEYWORDS' to avoid the Qt definition of the 'slots' macro that causes a conflict when including Python headers
* drop QT3_SUPPORT define
This commit is contained in:
wmayer
2023-07-10 22:27:20 +02:00
committed by Chris Hennes
parent 0fcdeded7a
commit 8c0fd2706a
7 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Gui/Quarter/ContextMenu.cpp
View File

@@ -60,7 +60,7 @@ ContextMenu::ContextMenu(QuarterWidget * quarterwidget)
QActionGroup * stereomodegroup = nullptr;
QActionGroup * transparencytypegroup = nullptr;
foreach (QAction * action, quarterwidget->renderModeActions()) {
Q_FOREACH (QAction * action, quarterwidget->renderModeActions()) {
if (!rendermodegroup) {
rendermodegroup = action->actionGroup();
} else {
@@ -73,7 +73,7 @@ ContextMenu::ContextMenu(QuarterWidget * quarterwidget)
rendermenu->addAction(action);
}
foreach (QAction * action, quarterwidget->stereoModeActions()) {
Q_FOREACH (QAction * action, quarterwidget->stereoModeActions()) {
if (!stereomodegroup) {
stereomodegroup = action->actionGroup();
} else {
@@ -86,7 +86,7 @@ ContextMenu::ContextMenu(QuarterWidget * quarterwidget)
stereomenu->addAction(action);
}
foreach (QAction * action, quarterwidget->transparencyTypeActions()) {
Q_FOREACH (QAction * action, quarterwidget->transparencyTypeActions()) {
if (!transparencytypegroup) {
transparencytypegroup = action->actionGroup();
} else {