From 1d823436fed656fd1a50497bd54a3b28b84e20a4 Mon Sep 17 00:00:00 2001 From: "Matthew J. Milner" Date: Thu, 24 Oct 2024 02:12:39 +0200 Subject: [PATCH] Add everything back in after QRegExp porting, except coordinateeditor Signed-off-by: Matthew J. Milner --- avogadro/qtplugins/CMakeLists.txt | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/avogadro/qtplugins/CMakeLists.txt b/avogadro/qtplugins/CMakeLists.txt index 4418607fd5..3d720716b0 100644 --- a/avogadro/qtplugins/CMakeLists.txt +++ b/avogadro/qtplugins/CMakeLists.txt @@ -138,14 +138,16 @@ add_subdirectory(templatetool) add_subdirectory(vibrations) add_subdirectory(vrml) +# These should work after the QRegExp migration +add_subdirectory(apbs) +add_subdirectory(cp2kinput) +add_subdirectory(forcefield) +add_subdirectory(gamessinput) + if(QT_VERSION EQUAL 5) - # This will need some work on the QRegExp migration - add_subdirectory(apbs) +# Still has a QPalette issue in Qt6 add_subdirectory(coordinateeditor) - add_subdirectory(cp2kinput) - add_subdirectory(forcefield) - add_subdirectory(gamessinput) - # The SVG library changed in Qt6 +# The SVG library changed in Qt6 add_subdirectory(svg) endif() @@ -162,11 +164,8 @@ if(USE_VTK) endif() # script plugins (input generators, etc.) -if(QT_VERSION EQUAL 5) - # QRegExp fixes needed in classes these depend on - add_subdirectory(commandscripts) - add_subdirectory(quantuminput) -endif() +add_subdirectory(commandscripts) +add_subdirectory(quantuminput) add_subdirectory(scriptcharges) add_subdirectory(scriptfileformats)