remove some qmake -project boilerplate from project files

Change-Id: I5e6103db42b4fcca4ed4c2ffaec71e71e73d5b95 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-12 12:03:01 +02:00 · 2012-04-12 12:03:01 +02:00 · 07581a87f8
commit 07581a87f8
parent 812adb58ba
13 changed files with 3 additions and 35 deletions
--- 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	= .

--- 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 \
--- 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 \
--- 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
--- 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)
--- 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
--- 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 = ./
--- 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 = ./
--- 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 
--- 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

--- 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
--- 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
--- 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