From c15499baf78f777de62899a376b0f3cd6b651920 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Mon, 21 Nov 2016 12:21:14 +0900 Subject: [PATCH] cleanup project files Change-Id: I4d605d97d050fb60e1fef749926cb1b92071782e Signed-off-by: Tasuku Suzuki --- HomeScreen/HomeScreen.pro | 11 ++++------- .../HomeScreenAppFrameworkBinderAGL.pro | 12 +++--------- HomeScreenSimulator/HomeScreenSimulator.pro | 12 +++--------- InputEventManager/InputEventManager.pro | 11 +++-------- SampleAppTimeDate/SampleAppTimeDate.pro | 12 +++--------- .../SampleHomeScreenInterfaceApp.pro | 3 +-- SampleNavigationApp/SampleNavigationApp.pro | 14 ++------------ WindowManager/WindowManager.pro | 13 +++---------- interfaces/interfaces.pro | 6 ++---- libhomescreen/libhomescreen.pro | 11 ++--------- 10 files changed, 26 insertions(+), 79 deletions(-) diff --git a/HomeScreen/HomeScreen.pro b/HomeScreen/HomeScreen.pro index 7c66fda..a9e950e 100644 --- a/HomeScreen/HomeScreen.pro +++ b/HomeScreen/HomeScreen.pro @@ -12,12 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += core gui dbus - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = HomeScreen TEMPLATE = app +TARGET = HomeScreen +QT = widgets dbus + +include(../interfaces/interfaces.pri) SOURCES += \ src/main.cpp \ @@ -40,8 +39,6 @@ HEADERS += \ src/homescreencontrolinterface.h \ src/layouthandler.h -include(../interfaces/interfaces.pri) - FORMS += \ resources/mainwindow.ui \ resources/settingswidget.ui \ diff --git a/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro b/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro index 9a35c35..f194609 100644 --- a/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro +++ b/HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro @@ -12,15 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += core dbus -QT -= gui - -TARGET = HomeScreenAppFrameworkBinderAGL -CONFIG += console -CONFIG -= app_bundle - TEMPLATE = app +TARGET = HomeScreenAppFrameworkBinderAGL +QT = core dbus +include(../interfaces/interfaces.pri) SOURCES += src/main.cpp \ src/homescreenappframeworkbinderagl.cpp @@ -28,8 +24,6 @@ SOURCES += src/main.cpp \ HEADERS += \ src/homescreenappframeworkbinderagl.h -include(../interfaces/interfaces.pri) - OTHER_FILES += \ README.md diff --git a/HomeScreenSimulator/HomeScreenSimulator.pro b/HomeScreenSimulator/HomeScreenSimulator.pro index 9005a3f..944a1fc 100644 --- a/HomeScreenSimulator/HomeScreenSimulator.pro +++ b/HomeScreenSimulator/HomeScreenSimulator.pro @@ -12,13 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += core gui dbus - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = HomeScreenSimulator TEMPLATE = app +TARGET = HomeScreenSimulator +QT = widgets dbus +include(../interfaces/interfaces.pri) SOURCES += \ src/main.cpp \ @@ -27,16 +25,12 @@ SOURCES += \ HEADERS += \ src/mainwindow.h -include(../interfaces/interfaces.pri) - FORMS += \ resources/mainwindow.ui OTHER_FILES += \ README.md -RESOURCES += - # remove generated files QMAKE_CLEAN += -r \ $$OUT_PWD/HomeScreenSimulator \ diff --git a/InputEventManager/InputEventManager.pro b/InputEventManager/InputEventManager.pro index 2e620e3..91e74dd 100644 --- a/InputEventManager/InputEventManager.pro +++ b/InputEventManager/InputEventManager.pro @@ -12,15 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += core dbus -QT -= gui - -TARGET = InputEventManager -CONFIG += console -CONFIG -= app_bundle - TEMPLATE = app +TARGET = InputEventManager +QT = core dbus +include(../interfaces/interfaces.pri) SOURCES += src/main.cpp \ src/inputeventmanager.cpp @@ -28,7 +24,6 @@ SOURCES += src/main.cpp \ HEADERS += \ src/inputeventmanager.h -include(../interfaces/interfaces.pri) #contains(QT_ARCH, arm.*) { # LIBS += -lpkgmgr-info diff --git a/SampleAppTimeDate/SampleAppTimeDate.pro b/SampleAppTimeDate/SampleAppTimeDate.pro index e41524e..245a92e 100644 --- a/SampleAppTimeDate/SampleAppTimeDate.pro +++ b/SampleAppTimeDate/SampleAppTimeDate.pro @@ -12,15 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += core dbus -QT -= gui - -TARGET = SampleAppTimeDate -CONFIG += console -CONFIG -= app_bundle - TEMPLATE = app +TARGET = SampleAppTimeDate +QT = dbus +include(../interfaces/interfaces.pri) SOURCES += src/main.cpp \ src/timedateprovider.cpp @@ -28,8 +24,6 @@ SOURCES += src/main.cpp \ HEADERS += \ src/timedateprovider.hpp -include(../interfaces/interfaces.pri) - OTHER_FILES += \ README.md diff --git a/SampleHomeScreenInterfaceApp/SampleHomeScreenInterfaceApp.pro b/SampleHomeScreenInterfaceApp/SampleHomeScreenInterfaceApp.pro index 4da1e36..738654c 100644 --- a/SampleHomeScreenInterfaceApp/SampleHomeScreenInterfaceApp.pro +++ b/SampleHomeScreenInterfaceApp/SampleHomeScreenInterfaceApp.pro @@ -1,6 +1,5 @@ TEMPLATE = app -CONFIG += console -CONFIG -= app_bundle +TARGET = SampleHomeScreenInterfaceApp CONFIG -= qt SOURCES += src/main.cpp \ diff --git a/SampleNavigationApp/SampleNavigationApp.pro b/SampleNavigationApp/SampleNavigationApp.pro index ab57a0c..2439e43 100644 --- a/SampleNavigationApp/SampleNavigationApp.pro +++ b/SampleNavigationApp/SampleNavigationApp.pro @@ -1,16 +1,6 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-11-04T17:03:47 -# -#------------------------------------------------- - -QT += core gui - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = SampleNavigationApp TEMPLATE = app - +TARGET = SampleNavigationApp +QT = widgets SOURCES += main.cpp\ mainwindow.cpp diff --git a/WindowManager/WindowManager.pro b/WindowManager/WindowManager.pro index 63beb7b..51fc972 100644 --- a/WindowManager/WindowManager.pro +++ b/WindowManager/WindowManager.pro @@ -12,13 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += core dbus -QT -= gui - +TEMPLATE = app TARGET = WindowManager -CONFIG += console -CONFIG -= app_bundle +QT = core dbus +include(../interfaces/interfaces.pri) SOURCES += src/main.cpp \ src/windowmanager.cpp @@ -26,14 +24,10 @@ SOURCES += src/main.cpp \ HEADERS += \ src/windowmanager.hpp -include(../interfaces/interfaces.pri) - contains(QT_ARCH, arm.*) { LIBS += -lilmControl -lilmCommon } -FORMS += - OTHER_FILES += \ README.md @@ -41,4 +35,3 @@ OTHER_FILES += \ QMAKE_CLEAN += -r \ $$OUT_PWD/WindowManager \ $$OUT_PWD/Makefile - diff --git a/interfaces/interfaces.pro b/interfaces/interfaces.pro index 1dad460..1d2920a 100644 --- a/interfaces/interfaces.pro +++ b/interfaces/interfaces.pro @@ -12,12 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -QT += dbus -QT -= gui - TEMPLATE = lib -CONFIG += staticlib TARGET = interfaces +QT = dbus +CONFIG += staticlib HEADERS += \ include/appframework.hpp \ diff --git a/libhomescreen/libhomescreen.pro b/libhomescreen/libhomescreen.pro index 47d1c32..dffaa85 100644 --- a/libhomescreen/libhomescreen.pro +++ b/libhomescreen/libhomescreen.pro @@ -1,13 +1,6 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2016-10-28T11:05:51 -# -#------------------------------------------------- - -QT -= core gui - -TARGET = homescreen TEMPLATE = lib +TARGET = homescreen +CONFIG -= qt SOURCES += \ src/libhomescreen.cpp -- 2.16.6