||

schrodinger · Feb 6, 2025 · 0ae275f · 0ae275f
1 parent 24e92d8
commit 0ae275f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/.github/actions/build-external/action.yml b/.github/actions/build-external/action.yml
@@ -30,6 +30,6 @@ runs:
       run: |
         cmake --build build/external/ --target ${{ inputs.library }} \
               --config ${{ env.BUILD_TYPE }} \
-        && \
+        || \
         C:/Windows/system32/cmd.exe /C \
         'cd /D D:/a/sketcher/sketcher/build/external/qt-prefix/src/qt-build/qtbase/src/3rdparty/libpng && D:/a/sketcher/sketcher/build/external/qt-prefix/src/qt-build/qtbase/bin/syncqt.exe @D:/a/sketcher/sketcher/build/external/qt-prefix/src/qt-build/qtbase/src/3rdparty/libpng/PngPrivate_syncqt_args'
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -112,8 +112,3 @@ foreach(TEST_SOURCE ${TEST_SOURCE_LIST})
   set_target_properties(${TEST_TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY
                                                   ${PREFIX_PATH})
 endforeach()
-if (LINUX)
-    qt_import_plugins(${TEST_TARGET}
-        INCLUDE Qt6::QXcbIntegrationPlugin
-    )
-endif()
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -32,8 +32,6 @@ if(LINUX)
         -DQT_QPA_DEFAULT_PLATFORM=xcb
         -DFEATURE_xkbcommon=ON
     )
-elseif(WIN32)
-    set(EXTRA_QT_CMAKE_ARGS -DSYNCQT=OFF)
 else()
     set(EXTRA_QT_CMAKE_ARGS "")
 endif()