Extracted more common stuff to ut_common.pri

diff --git a/tests/ut_common.pri b/tests/ut_common.pri
index 390dd94..0653b21 100644 (file)
--- a/tests/ut_common.pri
+++ b/tests/ut_common.pri
@@ -1,3 +1,9 @@
+QT -= gui
+CONFIG += console
+CONFIG -= app_bundle
+TEMPLATE = app
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
 SRCDIR = ../../src
 MOCKSDIR = ../mocks
 INCLUDEPATH += ../util \

diff --git a/tests/ut_coordinatesystemtransformer/ut_coordinatesystemtransformer.pro b/tests/ut_coordinatesystemtransformer/ut_coordinatesystemtransformer.pro
index 68a67df..0926e82 100644 (file)
--- a/tests/ut_coordinatesystemtransformer/ut_coordinatesystemtransformer.pro
+++ b/tests/ut_coordinatesystemtransformer/ut_coordinatesystemtransformer.pro
@@ -1,15 +1,9 @@
 include(../ut_common.pri)
 
 TARGET = ut_coordinatesystemtransformer
-QT += testlib
-QT -= gui
-CONFIG += console \
+CONFIG += \
     mobility
-CONFIG -= app_bundle
 MOBILITY = location
-TEMPLATE = app
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
 SOURCES += \
     ut_coordinatesystemtransformer.cpp \
     $$SRCDIR/coordinatesystemtransformer.cpp \

diff --git a/tests/ut_gmocktemplate/ut_gmocktemplate.pro b/tests/ut_gmocktemplate/ut_gmocktemplate.pro
index 78a6c05..a4beb4f 100644 (file)
--- a/tests/ut_gmocktemplate/ut_gmocktemplate.pro
+++ b/tests/ut_gmocktemplate/ut_gmocktemplate.pro
@@ -1,15 +1,10 @@
 include(../ut_common.pri)
 
 TARGET = ut_gmocktemplate
-QT += testlib
-QT -= gui
-CONFIG += console
-CONFIG -= app_bundle
-TEMPLATE = app
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-SOURCES += ut_gmocktemplate.cpp
-HEADERS +=
+SOURCES += ut_gmocktemplate.cpp \
+    $$SRCDIR/gmocktemplate.cpp
+HEADERS += \
+    $$SRCDIR/gmocktemplate.h
 
 include(../gmock.pri)
 include(../check.pri)

diff --git a/tests/ut_kkjgridcoordinate/ut_kkjgridcoordinate.pro b/tests/ut_kkjgridcoordinate/ut_kkjgridcoordinate.pro
index 3a42739..b537605 100644 (file)
--- a/tests/ut_kkjgridcoordinate/ut_kkjgridcoordinate.pro
+++ b/tests/ut_kkjgridcoordinate/ut_kkjgridcoordinate.pro
@@ -1,15 +1,9 @@
 include(../ut_common.pri)
 
 TARGET = ut_kkjgridcoordinate
-QT += testlib
-QT -= gui
-CONFIG += console \
+CONFIG += \
     mobility
-CONFIG -= app_bundle
 MOBILITY = location
-TEMPLATE = app
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
 SOURCES += ut_kkjgridcoordinate.cpp \
     $$SRCDIR/kkjgridcoordinate.cpp
 HEADERS += \

diff --git a/tests/ut_template/ut_template.pro b/tests/ut_template/ut_template.pro
index 8b03a46..d352622 100644 (file)
--- a/tests/ut_template/ut_template.pro
+++ b/tests/ut_template/ut_template.pro
@@ -2,13 +2,9 @@ include(../ut_common.pri)
 
 TARGET = ut_template
 QT += testlib
-QT -= gui
-CONFIG += console
-CONFIG -= app_bundle
-TEMPLATE = app
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-SOURCES += ut_template.cpp
-HEADERS += ut_template.h
+SOURCES += ut_template.cpp \
+    $$SRCDIR/template.cpp
+HEADERS += ut_template.h \
+    $$SRCDIR/template.h
 
 include(../check.pri)