Skip to content

Commit 8e498d7

Browse files
committed
qt6: use Qt6 as default build option in CMake
1 parent afab372 commit 8e498d7

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ project (juffed)
2020
cmake_minimum_required (VERSION 3.7)
2121

2222
# build options
23-
option(USE_QT6 "Use Qt6. Defaults to Qt4" OFF)
24-
option(USE_QT5 "Use Qt5. Defaults to Qt4" ON)
23+
option(USE_QT6 "Use Qt6. Defaults to Qt4" ON)
24+
option(USE_QT5 "Use Qt5. Defaults to Qt4" OFF)
2525
option(USE_SYSTEM_QTSINGLEAPPLICATION "Try to find system-wide QtSingleApplication library" $ENV{USE_SYSTEM_SINGLETON})
2626
option(USE_ENCA "Try to find Enca library for file encoding check" $ENV{USE_ENCA})
2727

debian/control

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ Priority: optional
77
Build-Depends: debhelper (>= 11~),
88
cmake,
99
libenca-dev,
10-
libqscintilla2-qt5-dev,
10+
libqscintilla2-qt6-dev,
1111
pkg-config,
12-
qttools5-dev,
13-
qttools5-dev-tools
12+
qt6-tools-dev,
13+
qt6-tools-dev-tools
1414
Standards-Version: 4.1.5
1515
Vcs-Browser: https://salsa.debian.org/lxqt-team/juffed
1616
Vcs-Git: https://salsa.debian.org/lxqt-team/juffed.git

debian/rules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/make -f
22
# DH_VERBOSE=1
33

4-
export USE_QT5=true
4+
export USE_QT6=true
5+
export USE_QT5=false
56
export USE_SYSTEM_SINGLETON=false
67
export USE_ENCA=true
78
export LC_ALL=C.UTF-8

plugins/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ OPTION(BUILD_TODOLIST "Build TODOList plugin" OFF)
1717
project (juffed-plugins)
1818
cmake_minimum_required (VERSION 3.7)
1919

20-
option(USE_QT6 "Use Qt6. Defaults to Qt4" OFF)
21-
option(USE_QT5 "Use Qt5. Defaults to Qt4" ON)
20+
option(USE_QT6 "Use Qt6. Defaults to Qt4" ON)
21+
option(USE_QT5 "Use Qt5. Defaults to Qt4" OFF)
2222

2323
# plugins are built standalone if is JUFFED_CMAKE_PLUGINS not set
2424
# Required variables (includes, libs) has to go from

0 commit comments

Comments
 (0)