aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@qt.io>2016-11-21 12:21:14 +0900
committerJens Bocklage <jens_bocklage@mentor.com>2016-11-21 09:34:57 +0000
commitc15499baf78f777de62899a376b0f3cd6b651920 (patch)
treefaa8f01c3fce809d32f9e1543954ed1c5392c79f
parent0120ff5e9f513b048e3904eaacaa530e1f0188bb (diff)
cleanup project files
Change-Id: I4d605d97d050fb60e1fef749926cb1b92071782e Signed-off-by: Tasuku Suzuki <tasuku.suzuki@qt.io>
-rw-r--r--HomeScreen/HomeScreen.pro11
-rw-r--r--HomeScreenAppFrameworkBinderAGL/HomeScreenAppFrameworkBinderAGL.pro12
-rw-r--r--HomeScreenSimulator/HomeScreenSimulator.pro12
-rw-r--r--InputEventManager/InputEventManager.pro11
-rw-r--r--SampleAppTimeDate/SampleAppTimeDate.pro12
-rw-r--r--SampleHomeScreenInterfaceApp/SampleHomeScreenInterfaceApp.pro3
-rw-r--r--SampleNavigationApp/SampleNavigationApp.pro14
-rw-r--r--WindowManager/WindowManager.pro13
-rw-r--r--interfaces/interfaces.pro6
-rw-r--r--libhomescreen/libhomescreen.pro11
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