File tree 3 files changed +6
-4
lines changed
3 files changed +6
-4
lines changed Original file line number Diff line number Diff line change @@ -627,14 +627,15 @@ target.depends *= $${libqtav.target}
627
627
628
628
DEB_INSTALL_LIST = $$join (SDK_HEADERS , \ \n.$$[QT_INSTALL_HEADERS]/, .$$[QT_INSTALL_HEADERS]/)
629
629
DEB_INSTALL_LIST += . $$[QT_INSTALL_LIBS ]/libQt *AV.prl . $$[QT_INSTALL_LIBS ]/libQt *AV.so
630
- DEB_INSTALL_LIST += . $$[QT_INSTALL_BINS ]/../mkspecs/features/av.prf . $$[QT_INSTALL_BINS ]/../mkspecs/modules/qt_lib_av.pri
630
+ MKSPECS_DIR =$$[QT_INSTALL_ARCHDATA ]/mkspecs # we only build deb for qt5, so QT_INSTALL_ARCHDATA is fine. qt4 can use $$[QMAKE_MKSPECS]
631
+ DEB_INSTALL_LIST += . $${MKSPECS_DIR }/features/av.prf . $${MKSPECS_DIR }/modules/qt_lib_av.pri
631
632
qtav_dev.target = qtav-dev.install
632
633
qtav_dev.commands = echo \ "$$join(DEB_INSTALL_LIST, \\n)\" >$$PROJECTROOT/debian/$${qtav_dev.target}
633
634
QMAKE_EXTRA_TARGETS += qtav_dev
634
635
target.depends *= $${qtav_dev.target }
635
636
636
637
DEB_INSTALL_LIST = $$join (SDK_PRIVATE_HEADERS , \ \n.$$[QT_INSTALL_HEADERS]/QtAV/*/, .$$[QT_INSTALL_HEADERS]/QtAV/*/)
637
- DEB_INSTALL_LIST += . $$[ QT_INSTALL_BINS ] /../mkspecs /modules/qt_lib_av_private.pri
638
+ DEB_INSTALL_LIST += . $${ MKSPECS_DIR } /modules/qt_lib_av_private.pri
638
639
qtav_private_dev.target = qtav-private-dev.install
639
640
qtav_private_dev.commands = echo \ "$$join(DEB_INSTALL_LIST, \\n)\" >$$PROJECTROOT/debian/$${qtav_private_dev.target}
640
641
QMAKE_EXTRA_TARGETS += qtav_private_dev
Original file line number Diff line number Diff line change @@ -67,7 +67,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
67
67
MODULE_PRF_FILE = $$OUT_PWD /mkspecs/features/ $${MODULE }.prf
68
68
NEW_LIB = $${LIBPREFIX }Qt $${QT_MAJOR_VERSION }$${MODULE_NAME }$${NAME_SUF }. $${LIBSUFFIX }
69
69
NEW_LIB_D = $${LIBPREFIX }Qt $${QT_MAJOR_VERSION }$${MODULE_NAME }$${NAME_SUF }$${DEBUG_SUF }. $${LIBSUFFIX }
70
- MKSPECS_DIR = $$[QT_INSTALL_BINS ] /.. /mkspecs
70
+ MKSPECS_DIR = $$[QT_INSTALL_ARCHDATA ] /mkspecs
71
71
} else {
72
72
MODULE_PRF_FILE = $$PWD /qt4/ $${MODULE }.prf
73
73
NEW_LIB = $${ORIG_LIB }
Original file line number Diff line number Diff line change @@ -151,7 +151,8 @@ target.depends *= $${libqtavwidgets.target}
151
151
152
152
DEB_INSTALL_LIST = $$join (SDK_HEADERS , \ \n.$$[QT_INSTALL_HEADERS]/, .$$[QT_INSTALL_HEADERS]/)
153
153
DEB_INSTALL_LIST += . $$[QT_INSTALL_LIBS ]/libQt *AVWidgets.prl . $$[QT_INSTALL_LIBS ]/libQt *AVWidgets.so
154
- DEB_INSTALL_LIST += . $$[QT_INSTALL_BINS ]/../mkspecs/features/avwidgets.prf . $$[QT_INSTALL_BINS ]/../mkspecs/modules/qt_lib_avwidgets.pri
154
+ MKSPECS_DIR =$$[QT_INSTALL_ARCHDATA ]/mkspecs
155
+ DEB_INSTALL_LIST += . $${MKSPECS_DIR }/features/avwidgets.prf . $${MKSPECS_DIR }/modules/qt_lib_avwidgets.pri
155
156
qtavwidgets_dev.target = qtav-dev.install # like qtmultimedia5-dev, contains widgets headers
156
157
qtavwidgets_dev.commands = echo \ "$$join(DEB_INSTALL_LIST, \\n)\" >>$$PROJECTROOT/debian/$${qtavwidgets_dev.target}
157
158
QMAKE_EXTRA_TARGETS += qtavwidgets_dev
You can’t perform that action at this time.
0 commit comments