diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2021-12-03 22:33:28 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2021-12-16 18:05:02 +0000 |
| commit | 10c4a4b4bdfdd468e52ae0fbbf84c77b64df2f8f (patch) | |
| tree | f8a26e38bb4764474d076199bcb91bb5da8c1fe9 /autotests/kconfig_compiler | |
| parent | bdb7f8bbd2d283fa87386a0fa2a505cb93b4a35c (diff) | |
| download | kconfig-10c4a4b4bdfdd468e52ae0fbbf84c77b64df2f8f.tar.gz kconfig-10c4a4b4bdfdd468e52ae0fbbf84c77b64df2f8f.tar.bz2 | |
WIP: Change the build system to enable building with Qt 6
This was built with:
-DQT_MAJOR_VERSION=6 \
-DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.90.0 \
-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055a00
Move the include(KDEInstallDirs) call before the first find_package(Qt*,
the former is what auto-detects the Qt version, and defaults to 5. This is
needed to be able to build against Qt5 by default.
All unit tests still pass.
Diffstat (limited to 'autotests/kconfig_compiler')
| -rw-r--r-- | autotests/kconfig_compiler/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/autotests/kconfig_compiler/CMakeLists.txt b/autotests/kconfig_compiler/CMakeLists.txt index 4caa17af..5cbf2e44 100644 --- a/autotests/kconfig_compiler/CMakeLists.txt +++ b/autotests/kconfig_compiler/CMakeLists.txt @@ -177,7 +177,7 @@ set(test_state_config_SRCS test_state_config_main.cpp) gen_kcfg_test_source(test_state_config test_state_config_SRCS GENERATE_MOC) ecm_add_test(TEST_NAME test_state_config ${test_state_config_SRCS}) -target_link_libraries(test_state_config KF5::ConfigGui Qt5::Test) +target_link_libraries(test_state_config KF5::ConfigGui Qt${QT_MAJOR_VERSION}::Test) ########### next target ############### @@ -234,7 +234,7 @@ gen_kcfg_test_source(signals_test_no_singleton_dpointer kconfigcompiler_test_sig ecm_add_test(${kconfigcompiler_test_signals_SRCS} TEST_NAME kconfigcompiler-signals-test - LINK_LIBRARIES Qt5::Test KF5::ConfigGui + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ConfigGui ) ########### next target ############### @@ -261,7 +261,7 @@ ecm_add_test(${test_param_minmax_SRCS} ecm_add_test(kconfigcompiler_test.cpp TEST_NAME kconfigcompiler-basic-test - LINK_LIBRARIES Qt5::Test + LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test ) |