napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: drop KDE-neon weirdness for KF6

Browse Source
This commit is contained in:
Adriaan de Groot 2023-09-07 23:41:26 +02:00
parent 7dffabef43
commit 0d1adc0692
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -168,10 +168,10 @@ set( _tx_incomplete eo es_PR gu ie ja-Hira kk kn lo lv mk ne_NP
if(WITH_QT6) if(WITH_QT6)
message(STATUS "Building Calamares with Qt6") message(STATUS "Building Calamares with Qt6")
set(qtname "Qt6") set(qtname "Qt6")
set(kfname "KF5") set(kfname "KF6")
set(QT_VERSION 6.5.0) set(QT_VERSION 6.5.0)
set(ECM_VERSION 5.240) set(ECM_VERSION 5.240)
set(KF_VERSION 5.103) # KDE Neon weirdness set(KF_VERSION 5.240) # KDE Neon weirdness
# API that was deprecated before Qt 5.15 causes a compile error # API that was deprecated before Qt 5.15 causes a compile error
add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060400) add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060400)
else() else()