From 0120ff5e9f513b048e3904eaacaa530e1f0188bb Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Mon, 21 Nov 2016 12:04:19 +0900 Subject: introduce interfaces.pri Change-Id: I3649d5275b9da71feb216eb70c9d9fda73507d69 Signed-off-by: Tasuku Suzuki --- HomeScreen/HomeScreen.pro | 6 +----- HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro | 5 +---- HomeScreenSimulator/HomeScreenSimulator.pro | 5 +---- InputEventManager/InputEventManager.pro | 5 +---- SampleAppTimeDate/SampleAppTimeDate.pro | 5 +---- WindowManager/WindowManager.pro | 4 +--- interfaces/interfaces.pri | 3 +++ 7 files changed, 9 insertions(+), 24 deletions(-) create mode 100644 interfaces/interfaces.pri diff --git a/HomeScreen/HomeScreen.pro b/HomeScreen/HomeScreen.pro index 46ed74c..7c66fda 100644 --- a/HomeScreen/HomeScreen.pro +++ b/HomeScreen/HomeScreen.pro @@ -40,11 +40,7 @@ HEADERS += \ src/homescreencontrolinterface.h \ src/layouthandler.h -INCLUDEPATH += $$OUT_PWD/../interfaces -INCLUDEPATH += ../interfaces/ - -LIBS += -L$$OUT_PWD/../interfaces -linterfaces - +include(../interfaces/interfaces.pri) FORMS += \ resources/mainwindow.ui \ diff --git a/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro b/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro index 7117ee0..9a35c35 100644 --- a/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro +++ b/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro @@ -28,10 +28,7 @@ SOURCES += src/main.cpp \ HEADERS += \ src/homescreenappframeworkbinderagl.h -INCLUDEPATH += $$OUT_PWD/../interfaces -INCLUDEPATH += ../interfaces/ - -LIBS += -L$$OUT_PWD/../interfaces -linterfaces +include(../interfaces/interfaces.pri) OTHER_FILES += \ README.md diff --git a/HomeScreenSimulator/HomeScreenSimulator.pro b/HomeScreenSimulator/HomeScreenSimulator.pro index 9550e69..9005a3f 100644 --- a/HomeScreenSimulator/HomeScreenSimulator.pro +++ b/HomeScreenSimulator/HomeScreenSimulator.pro @@ -27,10 +27,7 @@ SOURCES += \ HEADERS += \ src/mainwindow.h -INCLUDEPATH += $$OUT_PWD/../interfaces -INCLUDEPATH += ../interfaces - -LIBS += -L$$OUT_PWD/../interfaces -linterfaces +include(../interfaces/interfaces.pri) FORMS += \ resources/mainwindow.ui diff --git a/InputEventManager/InputEventManager.pro b/InputEventManager/InputEventManager.pro index 421ad6e..2e620e3 100644 --- a/InputEventManager/InputEventManager.pro +++ b/InputEventManager/InputEventManager.pro @@ -28,10 +28,7 @@ SOURCES += src/main.cpp \ HEADERS += \ src/inputeventmanager.h -INCLUDEPATH += $$OUT_PWD/../interfaces -INCLUDEPATH += ../interfaces/ - -LIBS += -L$$OUT_PWD/../interfaces -linterfaces +include(../interfaces/interfaces.pri) #contains(QT_ARCH, arm.*) { # LIBS += -lpkgmgr-info diff --git a/SampleAppTimeDate/SampleAppTimeDate.pro b/SampleAppTimeDate/SampleAppTimeDate.pro index e2ec9e2..e41524e 100644 --- a/SampleAppTimeDate/SampleAppTimeDate.pro +++ b/SampleAppTimeDate/SampleAppTimeDate.pro @@ -28,10 +28,7 @@ SOURCES += src/main.cpp \ HEADERS += \ src/timedateprovider.hpp -INCLUDEPATH += $$OUT_PWD/../interfaces -INCLUDEPATH += ../interfaces - -LIBS += -L$$OUT_PWD/../interfaces -linterfaces +include(../interfaces/interfaces.pri) OTHER_FILES += \ README.md diff --git a/WindowManager/WindowManager.pro b/WindowManager/WindowManager.pro index 58ce08a..63beb7b 100644 --- a/WindowManager/WindowManager.pro +++ b/WindowManager/WindowManager.pro @@ -26,10 +26,8 @@ SOURCES += src/main.cpp \ HEADERS += \ src/windowmanager.hpp -INCLUDEPATH += $$OUT_PWD/../interfaces -INCLUDEPATH += ../interfaces/ +include(../interfaces/interfaces.pri) -LIBS += -L$$OUT_PWD/../interfaces -linterfaces contains(QT_ARCH, arm.*) { LIBS += -lilmControl -lilmCommon } diff --git a/interfaces/interfaces.pri b/interfaces/interfaces.pri new file mode 100644 index 0000000..f05bbe4 --- /dev/null +++ b/interfaces/interfaces.pri @@ -0,0 +1,3 @@ +INCLUDEPATH += $$PWD $$OUT_PWD/../interfaces/ + +LIBS += -L$$OUT_PWD/../interfaces/ -linterfaces -- cgit