Skip to content

Commit 35611b1

Browse files
committed
fix wrong mkspecs dir wang-bin#779
1 parent a58bd49 commit 35611b1

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/libQtAV.pro

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,14 +627,15 @@ target.depends *= $${libqtav.target}
627627

628628
DEB_INSTALL_LIST = $$join(SDK_HEADERS, \\n.$$[QT_INSTALL_HEADERS]/, .$$[QT_INSTALL_HEADERS]/)
629629
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
631632
qtav_dev.target = qtav-dev.install
632633
qtav_dev.commands = echo \"$$join(DEB_INSTALL_LIST, \\n)\" >$$PROJECTROOT/debian/$${qtav_dev.target}
633634
QMAKE_EXTRA_TARGETS += qtav_dev
634635
target.depends *= $${qtav_dev.target}
635636

636637
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
638639
qtav_private_dev.target = qtav-private-dev.install
639640
qtav_private_dev.commands = echo \"$$join(DEB_INSTALL_LIST, \\n)\" >$$PROJECTROOT/debian/$${qtav_private_dev.target}
640641
QMAKE_EXTRA_TARGETS += qtav_private_dev

tools/install_sdk/install_sdk.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ greaterThan(QT_MAJOR_VERSION, 4) {
6767
MODULE_PRF_FILE = $$OUT_PWD/mkspecs/features/$${MODULE}.prf
6868
NEW_LIB = $${LIBPREFIX}Qt$${QT_MAJOR_VERSION}$${MODULE_NAME}$${NAME_SUF}.$${LIBSUFFIX}
6969
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
7171
} else {
7272
MODULE_PRF_FILE = $$PWD/qt4/$${MODULE}.prf
7373
NEW_LIB = $${ORIG_LIB}

widgets/libQtAVWidgets.pro

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,8 @@ target.depends *= $${libqtavwidgets.target}
151151

152152
DEB_INSTALL_LIST = $$join(SDK_HEADERS, \\n.$$[QT_INSTALL_HEADERS]/, .$$[QT_INSTALL_HEADERS]/)
153153
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
155156
qtavwidgets_dev.target = qtav-dev.install #like qtmultimedia5-dev, contains widgets headers
156157
qtavwidgets_dev.commands = echo \"$$join(DEB_INSTALL_LIST, \\n)\" >>$$PROJECTROOT/debian/$${qtavwidgets_dev.target}
157158
QMAKE_EXTRA_TARGETS += qtavwidgets_dev

0 commit comments

Comments
 (0)