Work in progress on qt6 support

3rdparty/qhttp.cmake

@@ -24,7 +24,7 @@ include_directories(
     ./qhttp/src/private
 )
 
-find_package(Qt5 COMPONENTS Core Network REQUIRED)
+find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS Core Network REQUIRED)
 find_package(HttpParser 2.2 QUIET)
 
 if(NOT HttpParser_FOUND)
@@ -77,7 +77,7 @@ set(qhttp_priv_hdrs
     qhttp/src/private/qsocket.hpp
 )
 
-qt5_wrap_cpp(MOCS
+qt_wrap_cpp(MOCS
     qhttp/src/qhttpabstracts.hpp
     qhttp/src/qhttpserverconnection.hpp
     qhttp/src/qhttpserver.hpp
@@ -95,11 +95,11 @@ add_library(qhttp
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-if(NOT MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
-endif()
+# if(NOT MSVC)
+#     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+# endif()
 
-target_link_libraries(qhttp Qt5::Core Qt5::Network ${EXTRA_LIBS})
+target_link_libraries(qhttp Qt${QT_DEFAULT_MAJOR_VERSION}::Core Qt${QT_DEFAULT_MAJOR_VERSION}::Network ${EXTRA_LIBS})
 target_include_directories(qhttp
     PUBLIC
     ./qhttp/src

CMakeLists.txt

@@ -44,6 +44,10 @@ if (APPLE OR (MSVC OR USE_MXE))
     set( DEFAULT_BUNDLED_USRSCTP ON )
 endif()
 
+if(QT_DEFAULT_MAJOR_VERSION STREQUAL "")
+    set(QT_DEFAULT_MAJOR_VERSION 6)
+endif()
+
 
 # Common options
 set( CHAT_TYPE "BASIC" CACHE STRING "Type of chatlog engine. WEBKIT | WEBENGINE | BASIC" )
@@ -59,7 +63,7 @@ option( USE_ASPELL "Build psi with aspell spellcheck" OFF )
 option( USE_CCACHE "Use ccache utility if found" ON )
 option( USE_CRASH "Enable builtin sigsegv handling" OFF )
 option( USE_DBUS "Enable DBUS support" ON )
-option( USE_KEYCHAIN "Enable Qt5Keychain support" ON )
+option( USE_KEYCHAIN "Enable QtKeychain support" ON )
 option( ONLY_BINARY "Build and install only binary file" OFF )
 option( ONLY_PLUGINS "Build psi plugins only" OFF )
 option( INSTALL_EXTRA_FILES "Install sounds, iconsets, certs, client_icons.txt, themes" ON )
@@ -113,6 +117,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" )
 
 include(policyRules)
 
+if(QT_DEFAULT_MAJOR_VERSION STREQUAL "")
+    set(QT_DEFAULT_MAJOR_VERSION 5)
+endif()
+
 set(IS_WEBKIT OFF CACHE INTERNAL "Use webkit. Internal variable")
 set(IS_WEBENGINE OFF CACHE INTERNAL "Use webengine. Internal variable")
 string(TOLOWER "${CHAT_TYPE}" LCHAT_TYPE)
@@ -125,7 +133,6 @@ if("${LCHAT_TYPE}" STREQUAL "webkit")
     message(STATUS "Chatlog type - QtWebKit")
 elseif("${LCHAT_TYPE}" STREQUAL "webengine")
     set(IS_WEBENGINE ON)
-    find_package( Qt5Core 5.9.0 REQUIRED )
     add_definitions(
         -DWEBKIT
         -DWEBENGINE=1
@@ -231,8 +238,8 @@ endif()
 STRING (REGEX MATCH "NetBSD" PROJECT_OS_NETBSD ${CMAKE_SYSTEM_NAME})
 if(PROJECT_OS_NETBSD)
     message(STATUS "NetBSD detected")
-    set(CMAKE_C_FLAGS "-Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib -Wl,-rpath,/usr/pkg/qt5/lib")
-    set(CMAKE_CXX_FLAGS "-Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib -Wl,-rpath,/usr/pkg/qt5/lib")
+    set(CMAKE_C_FLAGS "-Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib -Wl,-rpath,/usr/pkg/qt${QT_DEFAULT_MAJOR_VERSION}/lib")
+    set(CMAKE_CXX_FLAGS "-Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib -Wl,-rpath,/usr/pkg/qt${QT_DEFAULT_MAJOR_VERSION}/lib")
 endif()
 
 # Qt dependencies make building very slow

plugins/include/iqfilteringhost.h

@@ -4,18 +4,18 @@
 #include <QtPlugin>
 
 class IqNamespaceFilter;
-class QRegExp;
+class QRegularExpression;
 class QString;
 
 class IqFilteringHost {
 public:
     virtual ~IqFilteringHost() { }
 
     virtual void addIqNamespaceFilter(const QString &ns, IqNamespaceFilter *filter) = 0;
-    virtual void addIqNamespaceFilter(const QRegExp &ns, IqNamespaceFilter *filter) = 0;
+    virtual void addIqNamespaceFilter(const QRegularExpression &ns, IqNamespaceFilter *filter) = 0;
 
     virtual void removeIqNamespaceFilter(const QString &ns, IqNamespaceFilter *filter) = 0;
-    virtual void removeIqNamespaceFilter(const QRegExp &ns, IqNamespaceFilter *filter) = 0;
+    virtual void removeIqNamespaceFilter(const QRegularExpression &ns, IqNamespaceFilter *filter) = 0;
 };
 
 // TODO(mck): iq results/error may contain no namespaced element - think about this!!

src/AutoUpdater/CMakeLists.txt

@@ -56,7 +56,7 @@ if(USE_QDCHECKER)
     )
 endif()
 
-qt5_wrap_ui(UI_FORMS ${FORMS})
+qt_wrap_ui(UI_FORMS ${FORMS})
 add_library(AutoUpdater STATIC ${HEADERS} ${SOURCES} ${UI_FORMS})
 if(USE_QDCHECKER)
     add_dependencies(AutoUpdater build_ui_files tools widgets)

src/CMakeLists.txt

@@ -27,33 +27,23 @@ endif()
 set(TRANSLATIONS_DIR "${PROJECT_SOURCE_DIR}/translations" CACHE STRING "Path to Psi/Psi+ translations directory")
 
 #Work with external packages
-find_package(Qt5 COMPONENTS Widgets Core Gui Xml Network Concurrent Multimedia Svg Sql REQUIRED)
+set(REQUIRED_QT_COMPONENTS Widgets Core Gui Xml Network Concurrent Multimedia Svg Sql)
 if(IS_WEBKIT)
-    find_package(Qt5 COMPONENTS WebKit WebKitWidgets REQUIRED)
-    set(WEBKIT_LIBS Qt5::WebKit Qt5::WebKitWidgets)
+    list(APPEND REQUIRED_QT_COMPONENTS WebKit WebKitWidgets)
+    set(WEBKIT_LIBS Qt${QT_DEFAULT_MAJOR_VERSION}::WebKit Qt${QT_DEFAULT_MAJOR_VERSION}::WebKitWidgets)
 elseif(IS_WEBENGINE)
-    find_package(Qt5 COMPONENTS WebEngine WebEngineWidgets WebChannel REQUIRED)
-    set(WEBKIT_LIBS Qt5::WebEngine Qt5::WebEngineWidgets Qt5::WebChannel)
-endif()
-
-if(USE_KEYCHAIN)
-    find_package( Qt5 COMPONENTS Keychain QUIET )
-    if( Qt5Keychain_FOUND )
-        message(STATUS "Found Qt5Keychain: ${QTKEYCHAIN_LIBRARIES}")
-        set(KEYCHAIN_LIBS ${QTKEYCHAIN_LIBRARIES})
-        include_directories(${QTKEYCHAIN_INCLUDE_DIRS})
-        add_definitions(-DHAVE_KEYCHAIN)
-    else()
-        message(STATUS "Qt5Keychain - not found")
-    endif()
+    list(APPEND REQUIRED_QT_COMPONENTS WebEngine WebEngineWidgets WebChannel)
+    set(WEBKIT_LIBS Qt${QT_DEFAULT_MAJOR_VERSION}::WebEngine Qt${QT_DEFAULT_MAJOR_VERSION}::WebEngineWidgets Qt${QT_DEFAULT_MAJOR_VERSION}::WebChannel)
 endif()
 
 if(LINUX)
     if(USE_DBUS)
-        find_package(Qt5 COMPONENTS DBus REQUIRED)
+        list(APPEND REQUIRED_QT_COMPONENTS DBus)
     endif()
     if(USE_X11 OR LIMIT_X11_USAGE)
-        find_package(Qt5 COMPONENTS X11Extras REQUIRED)
+        if(QT_DEFAULT_MAJOR_VERSION LESS 6)
+            list(APPEND REQUIRED_QT_COMPONENTS X11Extras)
+        endif()
         find_package(XCB REQUIRED)
         set(EXTRA_LIBS
             ${XCB_LIBRARY}
@@ -64,7 +54,7 @@ if(LINUX)
 endif()
 
 if(APPLE)
-    find_package(Qt5MacExtras REQUIRED)
+    find_package(Qt${QT_DEFAULT_MAJOR_VERSION}MacExtras REQUIRED)
     if(USE_SPARKLE)
         find_package(Sparkle REQUIRED)
         include_directories(${SPARKLE_INCLUDE_DIR})
@@ -75,25 +65,40 @@ endif()
 if(NOT ONLY_BINARY AND (EXISTS "${TRANSLATIONS_DIR}"))
     set(LANGS_EXISTS ON)
     message(STATUS "${PROJECT_NAME} translations found at ${TRANSLATIONS_DIR}")
-    find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
-    set(QT_LUPDATE_EXECUTABLE ${Qt5_LUPDATE_EXECUTABLE})
+    list(APPEND REQUIRED_QT_COMPONENTS LinguistTools)
+    set(QT_LUPDATE_EXECUTABLE ${Qt${QT_DEFAULT_MAJOR_VERSION}_LUPDATE_EXECUTABLE})
 endif()
 
-set(QT_LIBRARIES Qt5::Widgets Qt5::Core Qt5::Network Qt5::Xml ${WEBKIT_LIBS} Qt5::Concurrent Qt5::Multimedia Qt5::Svg Qt5::Sql ${KEYCHAIN_LIBS})
+if(QT_DEFAULT_MAJOR_VERSION LESS 6)
+    find_package(Qt${QT_DEFAULT_MAJOR_VERSION} 5.10 REQUIRED COMPONENTS ${REQUIRED_QT_COMPONENTS})
+else()
+    find_package(Qt${QT_DEFAULT_MAJOR_VERSION} 6.6 REQUIRED COMPONENTS ${REQUIRED_QT_COMPONENTS})
+endif()
+set(QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Widgets Qt${QT_DEFAULT_MAJOR_VERSION}::Core Qt${QT_DEFAULT_MAJOR_VERSION}::Network Qt${QT_DEFAULT_MAJOR_VERSION}::Xml ${WEBKIT_LIBS} Qt${QT_DEFAULT_MAJOR_VERSION}::Concurrent Qt${QT_DEFAULT_MAJOR_VERSION}::Multimedia Qt${QT_DEFAULT_MAJOR_VERSION}::Svg Qt${QT_DEFAULT_MAJOR_VERSION}::Sql ${KEYCHAIN_LIBS})
+
+if(USE_KEYCHAIN)
+    find_package(Qt${QT_DEFAULT_MAJOR_VERSION} REQUIRED COMPONENTS Keychain)
+    set(KEYCHAIN_LIBS ${QTKEYCHAIN_LIBRARIES})
+    include_directories(${QTKEYCHAIN_INCLUDE_DIRS})
+    add_definitions(-DHAVE_KEYCHAIN)
+endif()
 
 if(LINUX)
     if(USE_DBUS)
-        list(APPEND QT_LIBRARIES Qt5::DBus)
+        list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::DBus)
     endif()
     if(USE_X11 OR LIMIT_X11_USAGE)
-        list(APPEND QT_LIBRARIES Qt5::X11Extras ${LIBXCB_LIBRARIES})
+        if(QT_DEFAULT_MAJOR_VERSION LESS 6)
+            list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::X11Extras)
+        endif()
+        list(APPEND QT_LIBRARIES ${LIBXCB_LIBRARIES})
     endif()
 endif()
 if(UNIX OR IS_WEBENGINE)
     list(APPEND EXTRA_LIBS qhttp)
 endif()
 if(APPLE)
-    list(APPEND QT_LIBRARIES Qt5::MacExtras)
+    list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::MacExtras)
     if(USE_SPARKLE)
         list(APPEND EXTRA_LDFLAGS ${SPARKLE_LIBRARY})
     endif()
@@ -312,11 +317,11 @@ if(LANGS_EXISTS)
     endforeach()
 
     # Psi translations
-    qt5_add_translation(QM ${PSI_TRANSLATIONS})
+    Qt_add_translation(QM ${PSI_TRANSLATIONS})
 
     if(WIN32 OR APPLE)
         # Qt translations
-        get_target_property(QtCore_location Qt5::Core LOCATION)
+        get_target_property(QtCore_location Qt${QT_DEFAULT_MAJOR_VERSION}::Core LOCATION)
         get_filename_component(QtCore_DIR "${QtCore_location}" DIRECTORY)
         if(APPLE)
             get_filename_component(QT_TRANSLATIONS_DIR "${QtCore_DIR}/../../translations" ABSOLUTE)
@@ -340,8 +345,8 @@ if(IS_WEBKIT OR IS_WEBENGINE)
     list(APPEND RESOURCES ${PROJECT_SOURCE_DIR}/themes/chatview.qrc)
 endif()
 
-qt5_add_resources(QRC_SOURCES ${RESOURCES})
-qt5_wrap_ui(UI_FORMS ${FORMS})
+Qt_add_resources(QRC_SOURCES ${RESOURCES})
+qt_wrap_ui(UI_FORMS ${FORMS})
 #Small hack to compile ui files before some *.cpp files
 add_custom_target(build_ui_files DEPENDS "${UI_FORMS}")
 
@@ -632,7 +637,7 @@ elseif(APPLE)
 
     # Special hack for qca package from Homebrew
     if(HOMEBREW AND NOT IRIS_BUNDLED_QCA)
-        install(DIRECTORY "${HOMEBREW}/opt/qca/lib/qt5/plugins/crypto"
+        install(DIRECTORY "${HOMEBREW}/opt/qca/lib/Qt${QT_DEFAULT_MAJOR_VERSION}/plugins/crypto"
                 DESTINATION "${CLIENT_NAME}.app/Contents/PlugIns")
     endif()
     # end of qca hack

src/Certificates/CMakeLists.txt

@@ -25,7 +25,7 @@ list(APPEND SOURCES
     CertificateHelpers.cpp
 )
 
-qt5_wrap_ui(UI_FORMS ${FORMS})
+qt_wrap_ui(UI_FORMS ${FORMS})
 add_library(Certificates STATIC ${HEADERS} ${SOURCES} ${UI_FORMS})
 target_link_libraries(Certificates ${QT_LIBRARIES} ${iris_LIB})
 target_include_directories(Certificates PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})

src/Certificates/CertificateDisplayDialog.cpp

@@ -23,6 +23,7 @@
 #include <QDateTime>
 #include <QLabel>
 #include <QPushButton>
+#include <QRegularExpression>
 #include <QtCrypto>
 
 CertificateDisplayDialog::CertificateDisplayDialog(const QCA::Certificate &cert, int result, QCA::Validity validity,
@@ -66,7 +67,7 @@ CertificateDisplayDialog::CertificateDisplayDialog(const QCA::Certificate &cert,
         QString hashstr = QCA::Hash(i == 0 ? "md5" : "sha1")
                               .hashToString(cert.toDER())
                               .toUpper()
-                              .replace(QRegExp("(..)"), ":\\1")
+                              .replace(QRegularExpression("(..)"), ":\\1")
                               .mid(1);
         str += QString("Fingerprint(%1): %2<br>").arg(i == 0 ? "MD5" : "SHA-1", hashstr);
     }

src/avcall/CMakeLists.txt

@@ -31,7 +31,7 @@ set(FORMS
     call.ui
 )
 
-qt5_wrap_ui(UI_FORMS ${FORMS})
+qt_wrap_ui(UI_FORMS ${FORMS})
 add_library(avcall STATIC ${SOURCES} ${HEADERS} ${UI_FORMS})
 add_dependencies(avcall build_ui_files)
 target_link_libraries(avcall ${QT_LIBRARIES} ${iris_LIB} libpsi_tools widgets)

src/chatview_te.cpp

@@ -46,8 +46,8 @@
 //#define CORRECTION_DEBUG
 
 static const char *  informationalColorOpt = "options.ui.look.colors.messages.informational";
-static const QRegExp underlineFixRE("(<a href=\"addnick://psi/[^\"]*\"><span style=\")");
-static const QRegExp removeTagsRE("<[^>]*>");
+static const QRegularExpression underlineFixRE("(<a href=\"addnick://psi/[^\"]*\"><span style=\")");
+static const QRegularExpression removeTagsRE("<[^>]*>");
 
 //----------------------------------------------------------------------------
 // ChatView

src/chatview_webkit.cpp

@@ -92,7 +92,7 @@ class ChatViewPrivate {
 
     static QString closeIconTags(const QString &richText)
     {
-        static QRegExp mIcon("(<icon [^>]+>)");
+        static QRegularExpression mIcon("(<icon [^>]+>)");
         QString        s(richText);
         s.replace(mIcon, "\\1</icon>");
         return s;

src/chatviewcommon.cpp

@@ -22,7 +22,7 @@
 #include "psioptions.h"
 
 #include <QApplication>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QWidget>
 #include <math.h>
 
@@ -49,7 +49,7 @@ QString ChatViewCommon::getMucNickColor(const QString &nick, bool isSelf)
         }
 
         QString nickwoun = nick; // nick without underscores
-        nickwoun.remove(QRegExp("(^_*|_*$)"));
+        nickwoun.remove(QRegularExpression("(^_*|_*$)"));
 
         if (PsiOptions::instance()->getOption("options.ui.muc.use-hash-nick-coloring").toBool()) {
             /* Hash-driven colors */

src/common.cpp

@@ -45,7 +45,7 @@
 #include <QObject>
 #include <QPaintDevice>
 #include <QProcess>
-#include <QRegExp>
+#include <QRegularExpression>
 #include <QSound>
 #include <QUrl>
 #include <QUuid>
@@ -192,9 +192,9 @@ QString status2txt(int status)
 
 QString logencode(QString str)
 {
-    str.replace(QRegExp("\\\\"), "\\\\"); // backslash to double-backslash
-    str.replace(QRegExp("\\|"), "\\p");   // pipe to \p
-    str.replace(QRegExp("\n"), "\\n");    // newline to \n
+    str.replace(QRegularExpression("\\\\"), "\\\\"); // backslash to double-backslash
+    str.replace(QRegularExpression("\\|"), "\\p");   // pipe to \p
+    str.replace(QRegularExpression("\n"), "\\n");    // newline to \n
     return str;
 }
 

src/contactmanager/CMakeLists.txt

@@ -22,7 +22,7 @@ list(APPEND FORMS
     contactmanagerdlg.ui
 )
 
-qt5_wrap_ui(UI_FORMS ${FORMS})
+qt_wrap_ui(UI_FORMS ${FORMS})
 add_library(contactmanager STATIC ${HEADERS} ${SOURCES} ${UI_FORMS})
 target_link_libraries(contactmanager ${QT_LIBRARIES} widgets)
 target_include_directories(contactmanager PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})

src/contactmanager/contactmanagermodel.cpp

@@ -244,9 +244,9 @@ void ContactManagerModel::invertByMatch(int columnIndex, int matchType, const QS
     emit    layoutAboutToBeChanged();
     Role    columnRole = roles[columnIndex];
     QString data;
-    QRegExp reg;
+    QRegularExpression reg;
     if (matchType == ContactManagerModel::RegexpMatch) {
-        reg = QRegExp(str);
+        reg = QRegularExpression(str);
     }
     for (UserListItem *u : qAsConst(_userList)) {
         data = userFieldString(u, columnRole);

src/desktoputil.cpp

@@ -35,7 +35,7 @@ QString defaultBrowser()
 {
     QSettings settings("HKEY_CLASSES_ROOT\\HTTP\\shell\\open\\command", QSettings::NativeFormat);
     QString   command = settings.value(".").toString();
-    QRegExp   rx("\"(.+)\"");
+    QRegularExpression   rx("\"(.+)\"");
     if (rx.indexIn(command) != -1)
         return rx.capturedTexts()[1];
     return command;

src/groupchatdlg.cpp

@@ -2102,7 +2102,7 @@ void GCMainDlg::message(const Message &_m, const PsiEvent::Ptr &e)
         tv.setDateTime(m.timeStamp());
 
         ui_.le_topic->setText(
-            topic.replace("\n\n", " || ").replace("\n", " | ").replace("\t", " ").replace(QRegExp("\\s{2,}"), " "));
+            topic.replace("\n\n", " || ").replace("\n", " | ").replace("\t", " ").replace(QRegularExpression("\\s{2,}"), " "));
         ui_.le_topic->setCursorPosition(0);
         ui_.le_topic->setToolTip(QString("<qt><p>%1</p></qt>").arg(subjectTooltip));
 

src/mcmdmanager.cpp

@@ -108,7 +108,7 @@ QString MCmdManager::serializeCommand(const QStringList &list)
 {
     QString retval;
     bool    needspace = false;
-    QRegExp specials("([\"\'\\\\ ])");
+    QRegularExpression specials("([\"\'\\\\ ])");
     for (QString item : list) {
         item.replace(specials, "\\\\1");
         if (item == "")