From b9e99a6481170fd727dee9d1a557357910913a1e Mon Sep 17 00:00:00 2001 From: "Matthew J. Milner" Date: Thu, 24 Oct 2024 10:07:32 +0200 Subject: [PATCH 1/3] Port to QRegularExpression again Signed-off-by: Matthew J. Milner --- avogadro/mainwindow.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/avogadro/mainwindow.cpp b/avogadro/mainwindow.cpp index 543124ba..3be18ece 100644 --- a/avogadro/mainwindow.cpp +++ b/avogadro/mainwindow.cpp @@ -2359,10 +2359,12 @@ void MainWindow::registerMoleQueue() StringList exts = ffm.fileExtensions(FileFormat::Read | FileFormat::File); // Create patterns list - QList patterns; + QList patterns; for (auto it = exts.begin(), itEnd = exts.end(); it != itEnd; ++it) { - patterns << QRegExp(extensionToWildCard(QString::fromStdString(*it)), - Qt::CaseInsensitive, QRegExp::Wildcard); + patterns << QRegularExpression( + QRegularExpression::wildcardToRegularExpression( + extensionToWildCard(QString::fromStdString(*it))), + QRegularExpression::CaseInsensitive); } // Register the executable: From 08002051acae5d48f68322a47c1173e0ae875eb1 Mon Sep 17 00:00:00 2001 From: "Matthew J. Milner" Date: Thu, 24 Oct 2024 10:26:14 +0200 Subject: [PATCH 2/3] Remove Qt6Core5Compat dependency Signed-off-by: Matthew J. Milner --- avogadro/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/avogadro/CMakeLists.txt b/avogadro/CMakeLists.txt index 08814e58..5ed8f16c 100644 --- a/avogadro/CMakeLists.txt +++ b/avogadro/CMakeLists.txt @@ -25,12 +25,16 @@ if(QT_VERSION EQUAL 6) Concurrent Widgets Network - Core5Compat OpenGL OpenGLWidgets REQUIRED) else() - find_package(Qt5 COMPONENTS Concurrent Widgets Network REQUIRED) + find_package(Qt5 + COMPONENTS + Concurrent + Widgets + Network + REQUIRED) endif() configure_file(avogadroappconfig.h.in avogadroappconfig.h) @@ -212,7 +216,7 @@ if(ENABLE_TESTING) target_link_libraries(avogadro QtTesting) endif() if(QT_VERSION EQUAL 6) - target_link_libraries(avogadro Qt6::Core5Compat Qt6::OpenGL Qt6::OpenGLWidgets) + target_link_libraries(avogadro Qt6::OpenGL Qt6::OpenGLWidgets) endif() if(USE_3DCONNEXION AND (WIN32 OR APPLE)) From 5b33947b4ede8feb62933e98e1224fb2948e1ee3 Mon Sep 17 00:00:00 2001 From: "Matthew J. Milner" Date: Thu, 24 Oct 2024 11:31:52 +0200 Subject: [PATCH 3/3] Disable molequeue build to match avogadrolibs workflow Signed-off-by: Matthew J. Milner --- .github/workflows/build_cmake.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 533aa877..498ad472 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -35,7 +35,7 @@ jobs: os: ubuntu-20.04, cc: "gcc", cxx: "g++", build_type: "Release", - cmake_flags: "-G Ninja -DINSTALL_BUNDLE_FILES=ON -DCMAKE_BUILD_TYPE=Release", + cmake_flags: "-G Ninja -DBUILD_MOLEQUEUE=OFF -DINSTALL_BUNDLE_FILES=ON -DCMAKE_BUILD_TYPE=Release", cpack: "", } - { @@ -43,7 +43,7 @@ jobs: os: macos-latest, cc: "clang", cxx: "clang++", build_type: "Release", - cmake_flags: "-G Ninja", + cmake_flags: "-G Ninja -DBUILD_MOLEQUEUE=OFF", cpack_flags: "-G DragNDrop", } - { @@ -51,7 +51,7 @@ jobs: os: windows-latest, cc: "cl", cxx: "cl", build_type: "Release", - cmake_flags: "", + cmake_flags: "-DBUILD_MOLEQUEUE=OFF", build_flags: "-j 2", cpack_flags: "-G NSIS", ssl_env: "D:\\a\\avogadroapp\\Qt\\Tools\\OpenSSLv3\\Win_x64",