Drop support for Qt5 and qmake projectHEADdev

Change-Id: I0b80905187e87980db22b1db43a0307e1b5a71f3
Reviewed-by: Alessandro Portale <[email protected]>

3 files changed, 14 insertions, 66 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a25dc5a..c8eacdc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,8 +11,8 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS
+find_package(QT NAMES Qt6 COMPONENTS Core REQUIRED)
+find_package(Qt6 COMPONENTS
     Core
     Widgets
     Quick
@@ -21,22 +21,25 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS
     REQUIRED)
 
 
+set(QT_MINIMUM_VERSION 6.3.0)
+if(QT_VERSION VERSION_LESS QT_MINIMUM_VERSION)
+    MESSAGE(FATAL_ERROR "Minimum supported Qt version: ${QT_MINIMUM_VERSION}")
+endif()
+
 qt_add_executable(${CMAKE_PROJECT_NAME}
     main.cpp
     importdummy_wasm.qml
 )
 
-# This does not work on Qt 6.3 beta 1, should be fixed in beta 3
-# You need to modify Qt6Targets.cmake to change the memory parameter
 set_property(TARGET ${CMAKE_PROJECT_NAME} PROPERTY QT_WASM_INITIAL_MEMORY "50MB")
 
 target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE
-    Qt${QT_VERSION_MAJOR}::Core
-    Qt${QT_VERSION_MAJOR}::Widgets
-    Qt${QT_VERSION_MAJOR}::Quick
-    Qt${QT_VERSION_MAJOR}::Gui
-    Qt${QT_VERSION_MAJOR}::Qml
-    Qt${QT_VERSION_MAJOR}::GuiPrivate
+    Qt6::Core
+    Qt6::Widgets
+    Qt6::Quick
+    Qt6::Gui
+    Qt6::Qml
+    Qt6::GuiPrivate
     )
 
 qt6_import_qml_plugins(${CMAKE_PROJECT_NAME})
diff --git a/main.cpp b/main.cpp
index 28ae144..6590381 100644
--- a/main.cpp
+++ b/main.cpp
@@ -224,9 +224,7 @@ void parseQmlprojectFile(const QString &fileName, QString *mainFile, QStringList
 
         *mainFile = basePath + mainFileMatch.captured(1);
         if (mainFile->startsWith(QLatin1String(":/")))
-#if QT_VERSION_MAJOR < 6
-        *mainFile = "qrc:" + mainFile->midRef(1);
-#else
+
         *mainFile = "qrc:" + mainFile->mid(1);
 
         const QRegularExpression qt6ProjectRegExp("qt6Project:\\s*true");
@@ -234,7 +232,6 @@ void parseQmlprojectFile(const QString &fileName, QString *mainFile, QStringList
         if (!qt6ProjectMatch.hasMatch()) {
             printWarning("This is not a Qt6 project.\nQt5 projects might work, but they are not officially supported.");
         }
-#endif
 
         const QRegularExpression importPathsRegExp("importPaths:\\s*\\[\\s*(.*)\\s*\\]");
         const QRegularExpressionMatch importPathsMatch = importPathsRegExp.match(text);
@@ -244,11 +241,7 @@ void parseQmlprojectFile(const QString &fileName, QString *mainFile, QStringList
                 cleanedPath = basePath + cleanedPath.mid(1, cleanedPath.length() - 2);
                 if (QFileInfo::exists(cleanedPath)) {
                     if (cleanedPath.startsWith(QLatin1String(":/")))
-#if QT_VERSION_MAJOR < 6
-                        cleanedPath = "qrc:" + cleanedPath.midRef(1);
-#else
                         cleanedPath = "qrc:" + cleanedPath.mid(1);
-#endif
                     importPaths->append(cleanedPath);
                 }
             }
@@ -284,9 +277,6 @@ int main(int argc, char *argv[])
         return showFatalMessageAndDie({QString("Qml project to show has not been defined.")});
     }
 #endif
-#if QT_VERSION_MAJOR < 6
-    QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
     QSurfaceFormat format = QSurfaceFormat::defaultFormat();
     format.setVersion(3,0);
     QSurfaceFormat::setDefaultFormat(format);
diff --git a/qtdesignviewer.pro b/qtdesignviewer.pro
deleted file mode 100644
index d60f930..0000000
--- a/qtdesignviewer.pro
+++ /dev/null
@@ -1,45 +0,0 @@
-QT += \
-    quick \
-    gui-private
-
-CONFIG += \
-    c++11
-
-DEFINES += QT_DEPRECATED_WARNINGS
-
-SOURCES += \
-    main.cpp
-
-wasm {
-    OTHER_FILES += \
-        index.html
-}
-
-android {
-    QT += widgets
-
-    DISTFILES += \
-        android/AndroidManifest.xml
-
-    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
-}
-
-RESOURCES += \
-    $$files(importdummy.qml)
-
-
-#CONFIG -= import_plugins
-#QTPLUGIN += qwasm qjpeg qgif
-#wasm:LIBS += -s ASSERTIONS=1 -s DISABLE_EXCEPTION_CATCHING=0
-#QMAKE_CXXFLAGS_RELEASE -= -O2
-#QMAKE_CXXFLAGS_RELEASE += -Os
-
-#EMCC_THREAD_LFLAGS += -s ASSERTIONS=1 -s TOTAL_MEMORY=33554432
-
-#QMAKE_WASM_TOTAL_MEMORY=33554432
-
-CONFIG(debug, debug|release) {
-    wasm:LIBS += -s SAFE_HEAP=1 -s STACK_OVERFLOW_CHECK=1
-}
-#wasm:LIBS += -s LIBRARY_DEBUG=1
-#wasm:LIBS += -s SYSCALL_DEBUG=1