Skip to content

Commit

Permalink
chore(CI): build Qt 6 version by default for deepin CI
Browse files Browse the repository at this point in the history
deepin OBS 构建默认构建 Qt 6 版本。

注意:对于现存版本的打包移植,目前仍然建议使用 Qt 5 版本。

Log:
  • Loading branch information
BLumia committed Nov 5, 2023
1 parent 1cf7e8b commit b9c96c6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
30 changes: 14 additions & 16 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,18 @@ Build-Depends:
libglib2.0-dev,
# v-- to get systemduserunitdir from its pkg-config data
systemd,
qtbase5-dev,
libqt5svg5-dev,
qtdeclarative5-dev,
qttools5-dev,
qttools5-dev-tools,
qtquickcontrols2-5-dev,
qt6-base-dev,
qt6-svg-dev,
qt6-declarative-dev,
qt6-tools-dev,
qt6-tools-dev-tools,
libdtkcommon-dev,
libdtkcore-dev,
libdtk6core-dev,
# v-- provides qdbusxml2cpp-fix binary
libdtkcore5-bin,
libdtk6core-bin,
# v-- provides DHiDPIHelper
libdtkgui-dev,
libdtkdeclarative-dev,
libdtk6gui-dev,
libdtk6declarative-dev,
libappstreamqt-dev
Standards-Version: 4.6.0
Rules-Requires-Root: no
Expand All @@ -31,13 +30,12 @@ Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends},
qml-module-qtquick-layouts,
qml-module-qtquick-window2,
qml-module-qtquick-controls2,
qml-module-qtquick-controls2-styles-chameleon,
qml6-module-qtquick-layouts,
qml6-module-qtquick-window,
qml6-module-qtquick-controls,
qml6-module-qtquick-controls2-styles-chameleon,
# v-- actually should be depended by qqc2-styles-chameleon
qml-module-qtgraphicaleffects,
qml-module-org-kde-kitemmodels
qml6-module-qt5compat-graphicaleffects
Conflicts: dde-launcher
Replaces: dde-launcher
Description: <insert up to 60 chars description>
Expand Down
3 changes: 2 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all

override_dh_auto_configure:
dh_auto_configure -- \
-DVERSION=$(DEB_VERSION_UPSTREAM)
-DVERSION=$(DEB_VERSION_UPSTREAM) \
-DPREFER_QT_5=OFF
1 change: 1 addition & 0 deletions src/models/appitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class AppItem : public QStandardItem
Q_ENUM(DDECategories)

public:
explicit AppItem() { Q_ASSERT_X(false, "AppItem()", "qmlRegisterUncreatableType require this for unknown reason in Qt6, another ctor should be used"); }
explicit AppItem(const QString &freedesktopId);
~AppItem();

Expand Down

0 comments on commit b9c96c6

Please sign in to comment.