debian: fix build error

gnibuoz · Mar 14, 2016 · 79ebf68 · 79ebf68
1 parent c2dbce1
commit 79ebf68
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/debian/rules b/debian/rules
@@ -7,6 +7,5 @@ export QT_SELECT=qt5
 	dh $@ --parallel
 
 override_dh_auto_configure:
-	test `qmake -query QT_VERSION |cut -d '.' -f 2` -lt 3 && sed -i '/\/\/IF_QT53/,/\/\/ENDIF_QT53/d' examples/QMLPlayer/qml/QMLPlayer/main.qml #ubuntu14.04 use qt5.2, remove incompatible code in qmlplayer. only minor version is checked
 	qmake "CONFIG+=no_rpath recheck config_libass_link config_openal_link no-tests"
 
diff --git a/examples/QMLPlayer/QMLPlayer.pro b/examples/QMLPlayer/QMLPlayer.pro
@@ -26,10 +26,9 @@ SOURCES += main.cpp
 lupdate_only{
 SOURCES = qml/QMLPlayer/*.qml qml/QMLPlayer/*.js
 }
+
 # Installation path
 target.path = $$[QT_INSTALL_BINS]
-
-
 desktopfile.files = $$PWD/../../qtc_packaging/debian_generic/QMLPlayer.desktop
 desktopfile.path = /usr/share/applications
 
@@ -60,3 +59,6 @@ DISTFILES += \
     android/gradlew.bat
 
 ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+
+#ubuntu14.04 use qt5.2, remove incompatible code in qmlplayer
+!qtAtLeast(5, 3):unix: system("sed -i '/\/\/IF_QT53/,/\/\/ENDIF_QT53/d' qml/QMLPlayer/main.qml")