From d91cf1e53b450483d92c50965fd3c33ab1da4300 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 21 Feb 2012 16:09:30 +0100 Subject: clean up qmake-generated projects remove "header" and assignmets which are defaults or bogus, reorder some assignments. Change-Id: I67403872168c890ca3b696753ceb01c605d19be7 Reviewed-by: Rohan McGovern --- tests/benchmarks/corelib/io/qdir/10000/10000.pro | 3 --- tests/benchmarks/corelib/io/qdir/tree/tree.pro | 3 --- tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro | 4 ---- tests/benchmarks/corelib/io/qiodevice/qiodevice.pro | 3 --- tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro | 3 --- tests/benchmarks/corelib/kernel/events/events.pro | 7 +++---- .../corelib/kernel/qcoreapplication/qcoreapplication.pro | 3 --- tests/benchmarks/corelib/kernel/qobject/qobject.pro | 3 --- .../tools/containers-associative/containers-associative.pro | 6 ++---- .../corelib/tools/containers-sequential/containers-sequential.pro | 6 ++---- tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro | 4 ---- tests/benchmarks/corelib/tools/qrect/qrect.pro | 4 ---- tests/benchmarks/corelib/tools/qregexp/qregexp.pro | 6 +----- .../gui/graphicsview/qgraphicswidget/qgraphicswidget.pro | 3 +-- tests/benchmarks/gui/image/blendbench/blendbench.pro | 4 +--- tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro | 2 +- tests/benchmarks/gui/kernel/qapplication/qapplication.pro | 3 --- tests/benchmarks/gui/painting/qregion/qregion.pro | 3 --- tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro | 4 ---- .../qfile_vs_qnetworkaccessmanager.pro | 3 --- .../network/access/qnetworkdiskcache/qnetworkdiskcache.pro | 5 ----- tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro | 3 --- tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro | 3 --- tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro | 3 --- tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro | 3 --- tests/benchmarks/opengl/opengl.pro | 3 --- tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro | 3 --- 27 files changed, 11 insertions(+), 89 deletions(-) (limited to 'tests/benchmarks') diff --git a/tests/benchmarks/corelib/io/qdir/10000/10000.pro b/tests/benchmarks/corelib/io/qdir/10000/10000.pro index 0319f2c195..196b3b5b30 100644 --- a/tests/benchmarks/corelib/io/qdir/10000/10000.pro +++ b/tests/benchmarks/corelib/io/qdir/10000/10000.pro @@ -1,9 +1,6 @@ TEMPLATE = app TARGET = bench_qdir_10000 -DEPENDPATH += . -INCLUDEPATH += . -# Input SOURCES += bench_qdir_10000.cpp QT = core testlib diff --git a/tests/benchmarks/corelib/io/qdir/tree/tree.pro b/tests/benchmarks/corelib/io/qdir/tree/tree.pro index 415580cc46..2998a13b57 100644 --- a/tests/benchmarks/corelib/io/qdir/tree/tree.pro +++ b/tests/benchmarks/corelib/io/qdir/tree/tree.pro @@ -1,9 +1,6 @@ TEMPLATE = app TARGET = bench_qdir_tree -DEPENDPATH += . -INCLUDEPATH += . -# Input SOURCES += bench_qdir_tree.cpp RESOURCES += bench_qdir_tree.qrc diff --git a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro index 0dca21c1a8..42e8708b02 100644 --- a/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro +++ b/tests/benchmarks/corelib/io/qfileinfo/qfileinfo.pro @@ -1,13 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qfileinfo -DEPENDPATH += . -INCLUDEPATH += . QT -= gui - QT += core-private testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro index 0dff0ce86e..20b02d190a 100644 --- a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro +++ b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qiodevice TARGET.EPOCHEAPSIZE = 0x100000 0x2000000 -DEPENDPATH += . -INCLUDEPATH += . QT = core testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro index 6ebee8a659..758930c139 100644 --- a/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro +++ b/tests/benchmarks/corelib/io/qtemporaryfile/qtemporaryfile.pro @@ -1,11 +1,8 @@ TEMPLATE = app TARGET = tst_bench_qtemporaryfile -DEPENDPATH += . -INCLUDEPATH += . QT = core testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/kernel/events/events.pro b/tests/benchmarks/corelib/kernel/events/events.pro index fb50116495..798a880e5b 100644 --- a/tests/benchmarks/corelib/kernel/events/events.pro +++ b/tests/benchmarks/corelib/kernel/events/events.pro @@ -1,7 +1,6 @@ TEMPLATE = app TARGET = tst_bench_events -DEPENDPATH += . -INCLUDEPATH += . -# Input -SOURCES += main.cpp + QT = core testlib + +SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro b/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro index 2c29fafca4..6896b3ff55 100644 --- a/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro +++ b/tests/benchmarks/corelib/kernel/qcoreapplication/qcoreapplication.pro @@ -2,8 +2,5 @@ QT += testlib TEMPLATE = app TARGET = tst_bench_qcoreapplication -DEPENDPATH += . -INCLUDEPATH += . -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/kernel/qobject/qobject.pro b/tests/benchmarks/corelib/kernel/qobject/qobject.pro index 8edd038b0d..e611eff0a2 100644 --- a/tests/benchmarks/corelib/kernel/qobject/qobject.pro +++ b/tests/benchmarks/corelib/kernel/qobject/qobject.pro @@ -2,9 +2,6 @@ QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qobject -DEPENDPATH += . -INCLUDEPATH += . -# Input HEADERS += object.h SOURCES += main.cpp object.cpp diff --git a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro index 940973d8db..49edcbee70 100644 --- a/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro +++ b/tests/benchmarks/corelib/tools/containers-associative/containers-associative.pro @@ -1,8 +1,6 @@ TEMPLATE = app TARGET = tst_bench_containers-associative -DEPENDPATH += . -INCLUDEPATH += . -# Input -SOURCES += main.cpp QT = core testlib + +SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro index 0ae83d70f7..6f731cb6d8 100644 --- a/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro +++ b/tests/benchmarks/corelib/tools/containers-sequential/containers-sequential.pro @@ -1,8 +1,6 @@ TEMPLATE = app TARGET = tst_bench_containers-sequential -DEPENDPATH += . -INCLUDEPATH += . -# Input -SOURCES += main.cpp QT = core testlib + +SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro index 10fdc7261e..23d8dae18f 100644 --- a/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro +++ b/tests/benchmarks/corelib/tools/qbytearray/qbytearray.pro @@ -1,11 +1,7 @@ TEMPLATE = app TARGET = tst_bench_qbytearray -DEPENDPATH += . -INCLUDEPATH += . QT = core testlib - CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qrect/qrect.pro b/tests/benchmarks/corelib/tools/qrect/qrect.pro index b05483599e..42cfcd8924 100644 --- a/tests/benchmarks/corelib/tools/qrect/qrect.pro +++ b/tests/benchmarks/corelib/tools/qrect/qrect.pro @@ -1,11 +1,7 @@ TEMPLATE = app TARGET = tst_bench_qrect -DEPENDPATH += . -INCLUDEPATH += . QT = core testlib - CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro index b427150041..59e7d19244 100644 --- a/tests/benchmarks/corelib/tools/qregexp/qregexp.pro +++ b/tests/benchmarks/corelib/tools/qregexp/qregexp.pro @@ -1,14 +1,10 @@ TEMPLATE = app TARGET = tst_bench_qregexp -DEPENDPATH += . -INCLUDEPATH += . -RESOURCES+=qregexp.qrc QT = core testlib - CONFIG += release -# Input SOURCES += main.cpp +RESOURCES += qregexp.qrc !isEmpty(QT.webkit.sources):exists($${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri) { include( $${QT.webkit.sources}/../JavaScriptCore/JavaScriptCore.pri ) diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro index 3c880eeb4d..00becec216 100644 --- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro @@ -2,6 +2,5 @@ QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qgraphicswidget -TEMPLATE = app -# Input + SOURCES += tst_qgraphicswidget.cpp diff --git a/tests/benchmarks/gui/image/blendbench/blendbench.pro b/tests/benchmarks/gui/image/blendbench/blendbench.pro index 74ba0a5920..17c18301bb 100644 --- a/tests/benchmarks/gui/image/blendbench/blendbench.pro +++ b/tests/benchmarks/gui/image/blendbench/blendbench.pro @@ -1,7 +1,5 @@ TEMPLATE = app TARGET = tst_bench_blendbench -DEPENDPATH += . -INCLUDEPATH += . QT += testlib -# Input + SOURCES += main.cpp diff --git a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro index 7f5d829b26..074c764e50 100644 --- a/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro +++ b/tests/benchmarks/gui/image/qpixmapcache/qpixmapcache.pro @@ -1,5 +1,5 @@ TARGET = tst_bench_qpixmapcache TEMPLATE = app QT += testlib -# Input + SOURCES += tst_qpixmapcache.cpp diff --git a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro index 19ca697102..86a016d42e 100644 --- a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro +++ b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro @@ -2,10 +2,7 @@ QT += widgets testlib TEMPLATE = app TARGET = tst_bench_qapplication -DEPENDPATH += . -INCLUDEPATH += . CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/gui/painting/qregion/qregion.pro b/tests/benchmarks/gui/painting/qregion/qregion.pro index 99bbd39043..1ff55080c5 100644 --- a/tests/benchmarks/gui/painting/qregion/qregion.pro +++ b/tests/benchmarks/gui/painting/qregion/qregion.pro @@ -1,9 +1,6 @@ TEMPLATE = app TARGET = tst_bench_qregion -DEPENDPATH += . -INCLUDEPATH += . QT += testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro index 82558e7ec9..5aef3520c0 100644 --- a/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/benchmarks/gui/styles/qstylesheetstyle/qstylesheetstyle.pro @@ -1,11 +1,7 @@ TEMPLATE = app QT += widgets testlib TARGET = tst_bench_qstylesheetstyle -DEPENDPATH += . -INCLUDEPATH += . - CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro index bee2adafa1..eccabd5d89 100644 --- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro +++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/qfile_vs_qnetworkaccessmanager.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qfile_vs_qnetworkaccessmanager -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro index fe2204bb16..9de05b5e65 100644 --- a/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro +++ b/tests/benchmarks/network/access/qnetworkdiskcache/qnetworkdiskcache.pro @@ -1,14 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qnetworkdiskcache -DEPENDPATH += . -INCLUDEPATH += . QT += gui # for QDesktopServices QT += network testlib CONFIG += release -# Input SOURCES += tst_qnetworkdiskcache.cpp - - diff --git a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro index 36eeb23fd0..1618728295 100644 --- a/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro +++ b/tests/benchmarks/network/access/qnetworkreply/qnetworkreply.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qnetworkreply -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += tst_qnetworkreply.cpp diff --git a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro index e26406fe74..41dae0051b 100644 --- a/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/benchmarks/network/kernel/qhostinfo/qhostinfo.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qhostinfo -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += core-private network network-private testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro index 1ea2f96d78..ebf1891433 100644 --- a/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro +++ b/tests/benchmarks/network/socket/qtcpserver/qtcpserver.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qtcpserver -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += tst_qtcpserver.cpp diff --git a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro index d71fd86316..a67c0d66df 100644 --- a/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro +++ b/tests/benchmarks/network/ssl/qsslsocket/qsslsocket.pro @@ -1,12 +1,9 @@ TEMPLATE = app TARGET = tst_bench_qsslsocket -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += tst_qsslsocket.cpp diff --git a/tests/benchmarks/opengl/opengl.pro b/tests/benchmarks/opengl/opengl.pro index 2866dbc650..1a81571a3f 100644 --- a/tests/benchmarks/opengl/opengl.pro +++ b/tests/benchmarks/opengl/opengl.pro @@ -1,11 +1,8 @@ TEMPLATE = app TARGET = tst_bench_opengl -DEPENDPATH += . -INCLUDEPATH += . QT += core-private gui-private opengl opengl-private testlib -# Input SOURCES += main.cpp include(../trusted-benchmarks.pri) diff --git a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro index 1db78e332d..d278e9e721 100644 --- a/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro +++ b/tests/benchmarks/plugins/imageformats/jpeg/jpeg.pro @@ -1,7 +1,5 @@ TEMPLATE = app TARGET = jpeg -DEPENDPATH += . -INCLUDEPATH += . QT += testlib CONFIG += release @@ -11,5 +9,4 @@ wince*: { DEFINES += SRCDIR=\\\"$$PWD/\\\" } -# Input SOURCES += jpeg.cpp -- cgit v1.2.3