Raise Qt requirement for building Qt Creator to Qt 6.5.3

And remove some version checks.
Qt 6.8 is released and Qt 6.5 and 6.8 are LTS.
This enables us to use some newer APIs like Qt::ColorScheme.

Change-Id: Ibdeeb933bb8e9fa2d1a02fba3e3f0b868747e763
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>

README.md

@@ -40,16 +40,16 @@ https://doc.qt.io/qtcreator-extending/coding-style.html
 
 Prerequisites:
 
-* Qt 6.4.3 or later. The Qt version that you use to build Qt Creator defines the
+* Qt 6.5.3 or later. The Qt version that you use to build Qt Creator defines the
   minimum platform versions that the result supports
-  (Windows 10, RHEL/CentOS 8.4, Ubuntu 20.04, macOS 10.15 for Qt 6.4.3).
+  (Windows 10, RHEL/CentOS 8.8, Ubuntu 22.04, macOS 11 for Qt 6.5.3).
 * Qt WebEngine module for QtWebEngine based help viewer
 * On Windows:
     * MinGW with GCC 11.2 or Visual Studio 2019 or later
     * Python 3.8 or later (optional, needed for the python enabled debug helper)
     * Debugging Tools for Windows (optional, for MSVC debugging support with CDB)
 * On macOS: latest Xcode
-* On Linux: GCC 9 or later
+* On Linux: GCC 10 or later
 * LLVM/Clang 14 or later (optional, LLVM/Clang 17 is recommended.
   See [instructions](#getting-llvmclang-for-the-clang-code-model) on how to
   get LLVM.

cmake/QtCreatorAPI.cmake

@@ -3,7 +3,7 @@ if(QT_CREATOR_API_DEFINED)
 endif()
 set(QT_CREATOR_API_DEFINED TRUE)
 
-set(IDE_QT_VERSION_MIN "6.4.3")
+set(IDE_QT_VERSION_MIN "6.5.3")
 
 include(${CMAKE_CURRENT_LIST_DIR}/QtCreatorAPIInternal.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/QtcSeparateDebugInfo.cmake)

cmake/QtCreatorAPIInternal.cmake

@@ -22,9 +22,7 @@ list(APPEND DEFAULT_DEFINES
   QT_CREATOR
   QT_NO_JAVA_STYLE_ITERATORS
   QT_NO_CAST_TO_ASCII QT_RESTRICTED_CAST_FROM_ASCII QT_NO_FOREACH
-  QT_DISABLE_DEPRECATED_BEFORE=0x050900
   QT_DISABLE_DEPRECATED_UP_TO=0x050900
-  QT_WARN_DEPRECATED_BEFORE=0x060400
   QT_WARN_DEPRECATED_UP_TO=0x060400
   QT_USE_QSTRINGBUILDER
 )

coin/instructions/common_environment.yaml

@@ -20,7 +20,7 @@ instructions:
         instructions:
           - type: EnvironmentVariable
             variableName: QTC_QT_BASE_URL
-            variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/qt/6.4.3/release_content/"
+            variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/qt/6.5.3/release_content/"
           - type: EnvironmentVariable
             variableName: MACOSX_DEPLOYMENT_TARGET
             variableValue: 11.0

src/app/main.cpp

@@ -485,8 +485,7 @@ private:
             // Show some kind of GUI with collected messages before exiting.
             // For Windows, Qt already uses a dialog.
             if (HostOsInfo::isLinuxHost()) {
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0) && QT_VERSION < QT_VERSION_CHECK(6, 5, 3)) \
-    || (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) && QT_VERSION < QT_VERSION_CHECK(6, 6, 1))
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) && QT_VERSION < QT_VERSION_CHECK(6, 6, 1))
                 // Information about potentially missing libxcb-cursor0 is printed by Qt since Qt 6.5.3 and Qt 6.6.1
                 // Add it manually for other versions >= 6.5.0
                 instance->messages.prepend("From 6.5.0, xcb-cursor0 or libxcb-cursor0 is needed to "

src/libs/utils/async.h

@@ -171,12 +171,7 @@ public:
 
     QFuture<ResultType> future() const { return m_watcher.future(); }
     ResultType result() const { return m_watcher.result(); }
-#if QT_VERSION > QT_VERSION_CHECK(6, 5, 2)
-    // takeResult is buggy before QTBUG-112513 as it resets the future state to "NoState".
-    // This in turn causes the FutureSynchronizer to deadlock in "waitForFinished", as the
-    // future is not in the finished state anymore.
     ResultType takeResult() const { return m_watcher.future().takeResult(); }
-#endif
     ResultType resultAt(int index) const { return m_watcher.resultAt(index); }
     QList<ResultType> results() const { return future().results(); }
     bool isResultAvailable() const { return future().resultCount(); }

src/libs/utils/persistentsettings.cpp

@@ -330,11 +330,7 @@ FilePath PersistentSettingsReader::filePath()
     \sa Utils::PersistentSettingsReader
 */
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 5, 0)
 static QString xmlAttrFromKey(const QString &key) { return key; }
-#else
-static QString xmlAttrFromKey(const QString &key) { return key; }
-#endif
 
 static void writeVariantValue(QXmlStreamWriter &w, const QVariant &variant, const QString &key = {})
 {

src/plugins/terminal/shortcutmap.cpp

@@ -237,11 +237,7 @@ bool ShortcutMap::tryShortcut(QKeyEvent *e)
         return dispatchEvent(e);
     }
     }
-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
     Q_UNREACHABLE_RETURN(false);
-#else
-    return false;
-#endif
 }
 
 /*! \internal