Skip to content
Permalink
Browse files

hacks

  • Loading branch information
nyalldawson committed Mar 22, 2021
1 parent 5a5fe5e commit 22bd3a2e2b3ecdeca47ced942e0bfc661fe56df4
Showing with 3 additions and 3 deletions.
  1. +3 −3 CMakeLists.txt
@@ -448,7 +448,7 @@ if(WITH_CORE)
else()
add_definitions(-DQT_NO_PRINTER)
endif()
# find_package(Qt6 COMPONENTS Positioning)
find_package(Qt6 COMPONENTS Positioning)
if (WITH_QTWEBKIT)
find_package(Qt5WebKit REQUIRED)
find_package(Qt5WebKitWidgets REQUIRED)
@@ -462,11 +462,11 @@ if(WITH_CORE)
endif()

# get the Qt plugins directory
get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
get_target_property(QMAKE_EXECUTABLE Qt6::qmake LOCATION)
EXEC_PROGRAM(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_PLUGINS" RETURN_VALUE return_code OUTPUT_VARIABLE DEFAULT_QT_PLUGINS_DIR )
set (QT_PLUGINS_DIR ${DEFAULT_QT_PLUGINS_DIR} CACHE STRING "Path to installation directory for Qt Plugins. Defaults to Qt native plugin directory")

message(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
message(STATUS "Found Qt version: ${Qt6Core_VERSION_STRING}")
if (WITH_QUICK)
find_package(Qt6 COMPONENTS Qml Quick REQUIRED)
if(${CMAKE_SYSTEM_NAME} MATCHES "Android")

0 comments on commit 22bd3a2

Please sign in to comment.