From 9b8dfed53b7ccc4f3c31be0ddb0fa886faeb5fb4 Mon Sep 17 00:00:00 2001 From: Sigurd Pettersen Date: Sun, 14 Jan 2024 16:58:19 +0100 Subject: [PATCH] Modifications for compile with Qt6 --- Fwk/VizFwk/TestApps/Qt/QtMultiView/CMakeLists.txt | 11 ++++++++--- .../TestApps/Qt/QtSnippetRunner/CMakeLists.txt | 7 ++++++- .../TestApps/Qt/QtSnippetRunner/QSRCommandLineArgs.h | 2 +- .../TestApps/Qt/QtSnippetRunner/QSRMainWindow.cpp | 12 ++++++------ .../TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.cpp | 1 + .../TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.h | 5 ++--- 6 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Fwk/VizFwk/TestApps/Qt/QtMultiView/CMakeLists.txt b/Fwk/VizFwk/TestApps/Qt/QtMultiView/CMakeLists.txt index d077f5c111..93bf747943 100644 --- a/Fwk/VizFwk/TestApps/Qt/QtMultiView/CMakeLists.txt +++ b/Fwk/VizFwk/TestApps/Qt/QtMultiView/CMakeLists.txt @@ -10,7 +10,10 @@ endif() find_package(OpenGL) -if (CEE_USE_QT5) +if (CEE_USE_QT6) + find_package(Qt6 COMPONENTS REQUIRED OpenGLWidgets) + set(QT_LIBRARIES Qt6::OpenGLWidgets ) +elseif (CEE_USE_QT5) find_package(Qt5 REQUIRED COMPONENTS Widgets) set(QT_LIBRARIES Qt5::Widgets) else() @@ -44,8 +47,10 @@ QMVMainWindow.h QMVWidget.h ) -if (CEE_USE_QT5) - qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) +if (CEE_USE_QT6) + qt_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES}) +elseif (CEE_USE_QT5) + qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES}) endif() add_executable(${PROJECT_NAME} ${CEE_CODE_FILES} ${MOC_SOURCE_FILES}) diff --git a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/CMakeLists.txt b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/CMakeLists.txt index bf7e29aef4..e4e75b18b3 100644 --- a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/CMakeLists.txt +++ b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/CMakeLists.txt @@ -52,8 +52,13 @@ QSRRunPanel.h QSRSnippetWidget.h ) + # Qt -if (CEE_USE_QT5) +if (CEE_USE_QT6) + find_package(Qt6 COMPONENTS REQUIRED OpenGLWidgets) + set(QT_LIBRARIES Qt6::OpenGLWidgets ) + qt_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES}) +elseif (CEE_USE_QT5) find_package(Qt5 COMPONENTS REQUIRED Core Gui Widgets OpenGL) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets Qt5::OpenGL) qt5_wrap_cpp(MOC_SOURCE_FILES ${MOC_HEADER_FILES} ) diff --git a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRCommandLineArgs.h b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRCommandLineArgs.h index 11f303df27..d3854020d8 100644 --- a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRCommandLineArgs.h +++ b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRCommandLineArgs.h @@ -37,7 +37,7 @@ #pragma once -class QStringList; +#include //================================================================================================== diff --git a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRMainWindow.cpp b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRMainWindow.cpp index f85801f453..9707e3afd8 100644 --- a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRMainWindow.cpp +++ b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRMainWindow.cpp @@ -127,7 +127,7 @@ void QSRMainWindow::createActions() } m_activateLastUsedSnippetAction = new QAction("Load last used snippet", this); - m_activateLastUsedSnippetAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L)); + m_activateLastUsedSnippetAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_L)); connect(m_activateLastUsedSnippetAction, SIGNAL(triggered()), SLOT(slotRunLastUsedSnippet())); m_closeCurrentSnippetAction = new QAction("Close Current Snippet", this); @@ -136,19 +136,19 @@ void QSRMainWindow::createActions() // View menu m_showHUDAction = new QAction("Show HUD", this); m_showHUDAction->setCheckable(true); - m_showHUDAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_H)); + m_showHUDAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_H)); connect(m_showHUDAction, SIGNAL(triggered()), SLOT(slotShowHUD())); m_redrawAction = new QAction("Redraw view", this); - m_redrawAction ->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); + m_redrawAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_R)); connect(m_redrawAction, SIGNAL(triggered()), SLOT(slotViewRedraw())); m_multipleRedrawAction = new QAction("Redraw 10 times", this); - m_multipleRedrawAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M)); + m_multipleRedrawAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_M)); connect(m_multipleRedrawAction, SIGNAL(triggered()), SLOT(slotViewMultipleRedraw())); m_multipleRedrawManyAction = new QAction("Redraw 50 times", this); - m_multipleRedrawManyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_M)); + m_multipleRedrawManyAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_M)); connect(m_multipleRedrawManyAction, SIGNAL(triggered()), SLOT(slotViewMultipleRedrawMany())); @@ -360,7 +360,7 @@ void QSRMainWindow::executeTestSnippetInNewWidget(const cvf::String& snippetId, // Store ID of this 'last run' snippet in registry QSettings settings("Ceetron", "SnippetRunner"); - settings.setValue("LastUsedSnippetID", snippetId.toAscii().ptr()); + settings.setValue("LastUsedSnippetID", cvfqt::Utils::toQString(snippetId)); repaint(); } diff --git a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.cpp b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.cpp index 23fe0e3542..e6d00cc8ce 100644 --- a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.cpp +++ b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.cpp @@ -43,6 +43,7 @@ #include +#include #include using cvfu::TestSnippet; diff --git a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.h b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.h index 39f63ca3e4..b80f975934 100644 --- a/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.h +++ b/Fwk/VizFwk/TestApps/Qt/QtSnippetRunner/QSRSnippetWidget.h @@ -45,17 +45,16 @@ #include "cvfuTestSnippet.h" -#include "cvfqtGLWidget.h" -#include "cvfqtOpenGLWidget.h" - class QTimer; #define QSR_USE_OPENGLWIDGET #ifdef QSR_USE_OPENGLWIDGET +#include "cvfqtOpenGLWidget.h" typedef cvfqt::OpenGLWidget OglWidgetBaseClass; #else +#include "cvfqtGLWidget.h" typedef cvfqt::GLWidget OglWidgetBaseClass; #endif