Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix build
bump version to 0.7.3.25
  • Loading branch information
Lorn Potter committed Oct 16, 2013
1 parent a58e3b0 commit 5080a0e
Show file tree
Hide file tree
Showing 13 changed files with 24 additions and 15 deletions.
1 change: 1 addition & 0 deletions common-config.pri
Expand Up @@ -41,3 +41,4 @@ contains(CONFIG,hybris) {
PKGCONFIG += android-headers
PKGCONFIG += libhardware
}

5 changes: 0 additions & 5 deletions qt-api/qt-api.pro
Expand Up @@ -50,8 +50,3 @@ include(../common-install.pri)
publicheaders.files = $$HEADERS
target.path = $$SHAREDLIBPATH
INSTALLS += target

mce {
DEFINES += SENSORFW_MCE_WATCHER
LIBS += -lsensorfw-qt5
}
2 changes: 1 addition & 1 deletion rpm/sensorfw-qt5-hybris.spec
@@ -1,6 +1,6 @@
Name: hybris-libsensorfw-qt5
Summary: Sensor Framework Qt5
Version: 0.7.3.24
Version: 0.7.3.25
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
Expand Down
2 changes: 1 addition & 1 deletion rpm/sensorfw-qt5.spec
Expand Up @@ -9,7 +9,7 @@ Name: sensorfw-qt5
# << macros

Summary: Sensor Framework Qt5
Version: 0.7.3.24
Version: 0.7.3.25
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
Expand Down
2 changes: 1 addition & 1 deletion rpm/sensorfw-qt5.yaml
@@ -1,6 +1,6 @@
Name: sensorfw-qt5
Summary: Sensor Framework Qt5
Version: 0.7.3.24
Version: 0.7.3.25
Release: 0
Group: "System/Sensor Framework"
License: LGPLv2+
Expand Down
2 changes: 1 addition & 1 deletion rpm/sensorfw.spec
Expand Up @@ -9,7 +9,7 @@ Name: sensorfw
# << macros

Summary: Sensor Framework
Version: 0.7.3.24
Version: 0.7.3.25
Release: 0
Group: System/Sensor Framework
License: LGPLv2+
Expand Down
2 changes: 1 addition & 1 deletion rpm/sensorfw.yaml
@@ -1,6 +1,6 @@
Name: sensorfw
Summary: Sensor Framework
Version: 0.7.3.24
Version: 0.7.3.25
Release: 0
Group: "System/Sensor Framework"
License: LGPLv2+
Expand Down
5 changes: 4 additions & 1 deletion tests/benchmark/benchmarktest/benchmarktest.pro
Expand Up @@ -15,13 +15,16 @@ SENSORFW_INCLUDEPATHS = ../../../include \
../../../filters \
../../../datatypes \
../../../qt-api \
../../../core \
../../..

DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS

QMAKE_LIBDIR_FLAGS += -L../../../qt-api \
-L../../../datatypes
-L../../../datatypes \
-L../../../core

equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
}
Expand Down
3 changes: 2 additions & 1 deletion tests/benchmark/dummyclient/dummyclient.pro
Expand Up @@ -13,7 +13,8 @@ SOURCES += dummyclient.cpp
HEADERS += dummyclient.h

QMAKE_LIBDIR_FLAGS += -L../../../qt-api \
-L../../../datatypes
-L../../../datatypes \
-L../../../core

equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
Expand Down
1 change: 1 addition & 0 deletions tests/benchmark/fakeadaptor/fakeadaptor.pro
Expand Up @@ -15,6 +15,7 @@ SENSORFW_INCLUDEPATHS = ../../../include \
../../../core \
../../../datatypes \
../../../filters \
../../../core \
../../..

DEPENDPATH += $$SENSORFW_INCLUDEPATHS
Expand Down
4 changes: 3 additions & 1 deletion tests/powermanagement/driverpolltest/driverpolltest.pro
Expand Up @@ -21,7 +21,9 @@ DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS

QMAKE_LIBDIR_FLAGS += -L../../../qt-api \
-L../../../datatypes
-L../../../datatypes\
-L../../../core

equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
}
Expand Down
Expand Up @@ -21,7 +21,9 @@ DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS

QMAKE_LIBDIR_FLAGS += -L../../../qt-api \
-L../../../datatypes
-L../../../datatypes\
-L../../../core

equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
}
Expand Down
Expand Up @@ -15,16 +15,20 @@ SENSORFW_INCLUDEPATHS = ../../../qt-api \
../../../include \
../../../filters \
../../../datatypes \
../../../core \
../../..

DEPENDPATH += $$SENSORFW_INCLUDEPATHS
INCLUDEPATH += $$SENSORFW_INCLUDEPATHS

QMAKE_LIBDIR_FLAGS += -L../../../qt-api \
-L../../../datatypes
-L../../../datatypes\
-L../../../core

equals(QT_MAJOR_VERSION, 4):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes -lsensorclient
}
equals(QT_MAJOR_VERSION, 5):{
QMAKE_LIBDIR_FLAGS += -lsensordatatypes-qt5 -lsensorclient-qt5
}

0 comments on commit 5080a0e

Please sign in to comment.