Use $$[QT_INSTALL_DATA] to for package configuration paths

Remove unnecessary prf target from src.pro.
sailfishos · Apr 23, 2013 · 76b0e31 · 76b0e31
1 parent 7eca1ae
commit 76b0e31
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/root.pro b/root.pro
@@ -2,15 +2,10 @@ TEMPLATE = subdirs
 
 SUBDIRS = src tests type-to-cxx
 
-equals(QT_MAJOR_VERSION, 4) {
-    prf.files = iodata.prf
-    prf.path = /usr/share/qt4/mkspecs/features
-}
-equals(QT_MAJOR_VERSION, 5) {
-    prf.files = iodata-qt5.prf
-    prf.path = /usr/share/qt5/mkspecs/features
-}
+prf.path =  $$[QT_INSTALL_DATA]/mkspecs/features
+equals(QT_MAJOR_VERSION, 4): prf.files = iodata.prf
+equals(QT_MAJOR_VERSION, 5): prf.files = iodata-qt5.prf
 
 INSTALLS = prf
 
-OTHER_FILES += rpm/*.spec
+OTHER_FILES += rpm/*.spec *.prf
diff --git a/src/src.pro b/src/src.pro
@@ -13,16 +13,7 @@ devheaders.files = iodata.h validator.h storage.h iodata validator storage
 equals(QT_MAJOR_VERSION, 4): devheaders.path  = /usr/include/iodata
 equals(QT_MAJOR_VERSION, 5): devheaders.path  = /usr/include/iodata-qt5
 
-equals(QT_MAJOR_VERSION, 4) {
-    prf.files = iodata.prf
-    prf.path = /usr/share/qt4/mkspecs/features
-}
-equals(QT_MAJOR_VERSION, 5) {
-    prf.files = iodata-qt5.prf
-    prf.path = /usr/share/qt5/mkspecs/features
-}
-
-INSTALLS = target devheaders prf
+INSTALLS = target devheaders
 
 FLEXSOURCES = datalang.l
 BISONSOURCES = datalang.y