remove some qmake -project boilerplate from project files

Change-Id: I5e6103db42b4fcca4ed4c2ffaec71e71e73d5b95
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/src/tools/moc/moc.pro b/src/tools/moc/moc.pro
index b40f213..8b53578 100644 (file)
--- a/src/tools/moc/moc.pro
+++ b/src/tools/moc/moc.pro
@@ -4,8 +4,8 @@ TARGET          = moc
 
 DEFINES         += QT_MOC QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS
 DESTDIR         = ../../../bin
-INCLUDEPATH    += . $$OUT_PWD/../../corelib/global
-DEPENDPATH     += .
+INCLUDEPATH    += $$OUT_PWD/../../corelib/global
+DEPENDPATH     += $$OUT_PWD/../../corelib/global
 LIBS           =
 OBJECTS_DIR    = .
 

diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
index ae1edf0..a109867 100644 (file)
--- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
+++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro
@@ -6,9 +6,6 @@ DESTDIR = ../../../bin
 
 include(../moc/moc.pri)
 
-INCLUDEPATH += .
-DEPENDPATH += .
-
 INCLUDEPATH += $$QT_BUILD_TREE/include \
                    $$QT_BUILD_TREE/include/QtDBus \
                    $$QT_BUILD_TREE/include/QtDBus/$$QT.dbus.VERSION \

diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
index ac71837..7cefff4 100644 (file)
--- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
+++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro
@@ -4,9 +4,6 @@ TARGET = qdbusxml2cpp
 
 DESTDIR = ../../../bin
 
-INCLUDEPATH += .
-DEPENDPATH += .
-
 include(../bootstrap/bootstrap.pri)
 
 INCLUDEPATH += $$QT_BUILD_TREE/include \

diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro
index 8debb03..b224f98 100644 (file)
--- a/src/tools/rcc/rcc.pro
+++ b/src/tools/rcc/rcc.pro
@@ -4,8 +4,6 @@ TARGET = rcc
 
 DESTDIR = ../../../bin
 DEFINES += QT_RCC
-INCLUDEPATH += .
-DEPENDPATH += .
 
 include(rcc.pri)
 HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h

diff --git a/src/tools/uic/uic.pro b/src/tools/uic/uic.pro
index d03645e..c4b7ca2 100644 (file)
--- a/src/tools/uic/uic.pro
+++ b/src/tools/uic/uic.pro
@@ -4,8 +4,6 @@ TARGET = uic
 
 DESTDIR = ../../../bin
 DEFINES += QT_UIC
-INCLUDEPATH += .
-DEPENDPATH += .
 
 include(uic.pri)
 include(cpp/cpp.pri)

diff --git a/tests/auto/other/macnativeevents/macnativeevents.pro b/tests/auto/other/macnativeevents/macnativeevents.pro
index 6ec0942..d72a87f 100644 (file)
--- a/tests/auto/other/macnativeevents/macnativeevents.pro
+++ b/tests/auto/other/macnativeevents/macnativeevents.pro
@@ -1,8 +1,5 @@
 CONFIG += testcase
 TARGET = tst_macnativeevents
-TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
 LIBS += -framework Carbon
 QT += widgets testlib
 HEADERS += qnativeevents.h nativeeventlist.h expectedeventlist.h

diff --git a/tests/auto/widgets/kernel/qapplication/modal/modal.pro b/tests/auto/widgets/kernel/qapplication/modal/modal.pro
index d948992..05e5a7a 100644 (file)
--- a/tests/auto/widgets/kernel/qapplication/modal/modal.pro
+++ b/tests/auto/widgets/kernel/qapplication/modal/modal.pro
@@ -1,7 +1,4 @@
-TEMPLATE = app
 QT += widgets
-DEPENDPATH += .
-INCLUDEPATH += .
 SOURCES += main.cpp \
     base.cpp
 DESTDIR = ./

diff --git a/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro b/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro
index 8498d8b..3c3b2d0 100644 (file)
--- a/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro
+++ b/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro
@@ -1,6 +1,3 @@
-TEMPLATE = app
-DEPENDPATH += .
-INCLUDEPATH += .
 QT += widgets
 SOURCES += main.cpp
 DESTDIR = ./

diff --git a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
index dc579ab..20559ce 100644 (file)
--- a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
+++ b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro
@@ -1,8 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qxmlsimplereader
-TEMPLATE = app
 DEPENDPATH += parser
-INCLUDEPATH += . parser 
+INCLUDEPATH += parser
 
 HEADERS +=  parser/parser.h
 SOURCES += tst_qxmlsimplereader.cpp parser/parser.cpp 

diff --git a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
index af3be79..3cfb0b4 100644 (file)
--- a/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
+++ b/tests/benchmarks/corelib/io/qdiriterator/qdiriterator.pro
@@ -1,7 +1,4 @@
-TEMPLATE = app
 TARGET = tst_bench_qdiriterator
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT = core testlib
 

diff --git a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro
index 12d131f..8ea7200 100644 (file)
--- a/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro
+++ b/tests/benchmarks/corelib/kernel/qvariant/qvariant.pro
@@ -1,7 +1,4 @@
-TEMPLATE = app
 TARGET = tst_bench_qvariant
-DEPENDPATH += .
-INCLUDEPATH += .
 QT += testlib
 
 CONFIG += release

diff --git a/tests/benchmarks/gui/animation/qanimation/qanimation.pro b/tests/benchmarks/gui/animation/qanimation/qanimation.pro
index d72e3c8..a585946 100644 (file)
--- a/tests/benchmarks/gui/animation/qanimation/qanimation.pro
+++ b/tests/benchmarks/gui/animation/qanimation/qanimation.pro
@@ -1,9 +1,6 @@
 QT += widgets testlib
 
-TEMPLATE = app
 TARGET = tst_bench_qanimation
-DEPENDPATH += .
-INCLUDEPATH += .
 
 CONFIG += release
 #CONFIG += debug

diff --git a/tests/manual/qssloptions/qssloptions.pro b/tests/manual/qssloptions/qssloptions.pro
index 3fcb696..55d6dd0 100644 (file)
--- a/tests/manual/qssloptions/qssloptions.pro
+++ b/tests/manual/qssloptions/qssloptions.pro
@@ -1,8 +1,5 @@
 CONFIG += testcase
-TEMPLATE = app
 TARGET = tst_qssloptions
-DEPENDPATH += .
-INCLUDEPATH += .
 
 QT -= gui
 QT += network testlib