[sensorfw] fix for qt4 build and qt5 package build

sailfishos · May 3, 2013 · 45dfcc5 · 45dfcc5
1 parent 0aa9d3e
commit 45dfcc5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/rpm/sensorfw-qt5.spec b/rpm/sensorfw-qt5.spec
@@ -29,7 +29,12 @@ Requires(post): systemd
 Requires(postun): /sbin/ldconfig
 Requires(postun): systemd
 BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(mce)
+
 Obsoletes:   sensorframework
 
 %description
@@ -88,7 +93,8 @@ unset LD_AS_NEEDED
 export LD_RUN_PATH=/usr/lib/sensord/
 # << build pre
 
-%qmake  \
+export QT_SELECT=5
+%qmake \
     CONFIG+=mce
 
 make %{?jobs:-j%jobs}
@@ -100,6 +106,7 @@ make %{?jobs:-j%jobs}
 rm -rf %{buildroot}
 # >> install pre
 # << install pre
+export QT_SELECT=5
 %qmake_install
 
 # >> install post

diff --git a/rpm/sensorfw-qt5.yaml b/rpm/sensorfw-qt5.yaml
@@ -20,6 +20,7 @@ Requires:
 PkgConfigBR:
     - Qt5Core
     - gconf-2.0
+    - mce
 
 #PkgBR:
 #    - doxygen
@@ -29,7 +30,7 @@ Obsoletes:
     - sensorframework
 
 Configure: none
-Builder: qmake
+Builder: qmake5
 UseAsNeeded: no
 
 QMakeOptions:
@@ -39,7 +40,7 @@ SubPackages:
     - Name: devel
       Group: Development/Libraries
       Requires:
-          - qt-devel
+          - qt5-devel
       Summary: Sensor framework daemon libraries development headers
       Description: |
         Development headers for sensor framework daemon and libraries.

diff --git a/rpm/sensorfw.spec b/rpm/sensorfw.spec
@@ -30,6 +30,7 @@ Requires(postun): /sbin/ldconfig
 Requires(postun): systemd
 BuildRequires:  pkgconfig(QtCore)
 BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(QtDeclarative)
 BuildRequires:  pkgconfig(contextprovider-1.0)
 Obsoletes:   sensorframework
 

diff --git a/sensorfw.pro b/sensorfw.pro
@@ -47,3 +47,13 @@ SENSORDCONFIGFILES.path = /etc/sensorfw/sensord.conf.d
 publicheaders.files += include/*.h
 
 INSTALLS += PKGCONFIGFILES QTCONFIGFILES DBUSCONFIGFILES SENSORDCONFIGFILE SENSORDCONFIGFILES
+
+equals(QT_MAJOR_VERSION, 4):  {
+    OTHER_FILES += rpm/sensorfw.spec \
+                   rpm/sensorfw.yaml
+}
+
+equals(QT_MAJOR_VERSION, 5):  {
+    OTHER_FILES += rpm/sensorfw-qt5.spec \
+                   rpm/sensorfw-qt5.yaml
+}
diff --git a/tests/benchmark/dummyclient/dummyclient.pro b/tests/benchmark/dummyclient/dummyclient.pro
@@ -16,7 +16,7 @@ QMAKE_LIBDIR_FLAGS += -L../../../qt-api  \
                       -L../../../datatypes
 
 equals(QT_MAJOR_VERSION, 4):{
-    QMAKE_LIBDIR_FLAGS += -lsensordatatypes
+    QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
 }
 equals(QT_MAJOR_VERSION, 5):{
     QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5