diff options
101 files changed, 53 insertions, 597 deletions
diff --git a/examples/dbus/complexpingpong/complexping.pro b/examples/dbus/complexpingpong/complexping.pro index bc45e99c7b..303f6eb2d7 100644 --- a/examples/dbus/complexpingpong/complexping.pro +++ b/examples/dbus/complexpingpong/complexping.pro @@ -1,14 +1,9 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . QT -= gui CONFIG += qdbus -# Input HEADERS += complexping.h ping-common.h SOURCES += complexping.cpp -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong diff --git a/examples/dbus/complexpingpong/complexpong.pro b/examples/dbus/complexpingpong/complexpong.pro index 0934740185..fcb833e596 100644 --- a/examples/dbus/complexpingpong/complexpong.pro +++ b/examples/dbus/complexpingpong/complexpong.pro @@ -1,14 +1,9 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . QT -= gui CONFIG += qdbus -# Input HEADERS += complexpong.h SOURCES += complexpong.cpp -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/complexpingpong diff --git a/examples/dbus/dbus-chat/dbus-chat.pro b/examples/dbus/dbus-chat/dbus-chat.pro index e1a3539cf3..29b1f56826 100644 --- a/examples/dbus/dbus-chat/dbus-chat.pro +++ b/examples/dbus/dbus-chat/dbus-chat.pro @@ -1,9 +1,6 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . CONFIG += qdbus +QT += widgets -# Input HEADERS += chat.h chat_adaptor.h chat_interface.h SOURCES += chat.cpp chat_adaptor.cpp chat_interface.cpp FORMS += chatmainwindow.ui chatsetnickname.ui @@ -17,5 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/chat INSTALLS += target sources -QT += widgets simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/listnames/listnames.pro b/examples/dbus/listnames/listnames.pro index a863bbc83d..27805e5f6b 100644 --- a/examples/dbus/listnames/listnames.pro +++ b/examples/dbus/listnames/listnames.pro @@ -1,14 +1,9 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . QT -= gui CONFIG += qdbus win32:CONFIG += console -# Input SOURCES += listnames.cpp -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/listnames diff --git a/examples/dbus/pingpong/ping.pro b/examples/dbus/pingpong/ping.pro index 533371c2ce..2ba1ad2c9c 100644 --- a/examples/dbus/pingpong/ping.pro +++ b/examples/dbus/pingpong/ping.pro @@ -1,15 +1,9 @@ -TEMPLATE = app -TARGET = ping -DEPENDPATH += . -INCLUDEPATH += . QT -= gui CONFIG += qdbus -# Input HEADERS += ping-common.h SOURCES += ping.cpp -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong diff --git a/examples/dbus/pingpong/pong.pro b/examples/dbus/pingpong/pong.pro index 37a5a5c404..5c7cb85c43 100644 --- a/examples/dbus/pingpong/pong.pro +++ b/examples/dbus/pingpong/pong.pro @@ -1,15 +1,9 @@ -TEMPLATE = app -TARGET = pong -DEPENDPATH += . -INCLUDEPATH += . QT -= gui CONFIG += qdbus -# Input HEADERS += ping-common.h pong.h SOURCES += pong.cpp -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/pingpong diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro index 761181a782..ea49a7a6d3 100644 --- a/examples/dbus/remotecontrolledcar/car/car.pro +++ b/examples/dbus/remotecontrolledcar/car/car.pro @@ -1,13 +1,6 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Mon Aug 28 19:50:14 2006 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += widgets CONFIG += qdbus -# Input # DBUS_ADAPTORS += car.xml HEADERS += car.h car_adaptor.h SOURCES += car.cpp main.cpp car_adaptor.cpp @@ -18,5 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/car INSTALLS += target sources -QT += widgets simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro index 36983e0c54..07fd169519 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.pro +++ b/examples/dbus/remotecontrolledcar/controller/controller.pro @@ -1,13 +1,6 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Tue Aug 29 12:28:05 2006 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += widgets CONFIG += qdbus -# Input # DBUS_INTERFACES += car.xml FORMS += controller.ui HEADERS += car_interface.h controller.h @@ -19,5 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dbus/remotecontrolledcar/controller INSTALLS += target sources -QT += widgets simulator: warning(This example does not work on Simulator platform) diff --git a/examples/embedded/styleexample/styleexample.pro b/examples/embedded/styleexample/styleexample.pro index 3cd4d0a3c0..a0fd001cf9 100644 --- a/examples/embedded/styleexample/styleexample.pro +++ b/examples/embedded/styleexample/styleexample.pro @@ -1,6 +1,5 @@ -TEMPLATE = app +QT += widgets -# Input HEADERS += stylewidget.h FORMS += stylewidget.ui SOURCES += main.cpp stylewidget.cpp @@ -10,5 +9,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample INSTALLS += target sources - -QT += widgets widgets diff --git a/examples/graphicsview/boxes/boxes.pro b/examples/graphicsview/boxes/boxes.pro index 176bc3a1cf..0564ae0ba6 100644 --- a/examples/graphicsview/boxes/boxes.pro +++ b/examples/graphicsview/boxes/boxes.pro @@ -1,13 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) ma 3. nov 17:33:30 2008 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . +QT += opengl widgets -# Input HEADERS += 3rdparty/fbm.h \ glbuffers.h \ glextensions.h \ @@ -27,8 +19,6 @@ SOURCES += 3rdparty/fbm.c \ RESOURCES += boxes.qrc -QT += opengl widgets - # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/boxes sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg *.png *.fsh *.vsh *.par diff --git a/examples/graphicsview/flowlayout/flowlayout.pro b/examples/graphicsview/flowlayout/flowlayout.pro index 8d1f7b85ff..4a4b22bcf7 100644 --- a/examples/graphicsview/flowlayout/flowlayout.pro +++ b/examples/graphicsview/flowlayout/flowlayout.pro @@ -1,12 +1,8 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += widgets QMAKE_PROJECT_NAME = flowlayout_graphicsview -# Input HEADERS += flowlayout.h window.h SOURCES += flowlayout.cpp main.cpp window.cpp -QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro b/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro index 4c2fdc60de..b6eb292a12 100644 --- a/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro +++ b/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro @@ -1,8 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Tue May 12 15:22:25 2009 -###################################################################### +QT += widgets -# Input SOURCES += main.cpp RESOURCES += weatheranchorlayout.qrc @@ -12,5 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES weatheranchorlayout.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/weatheranchorlayout INSTALLS += target sources -QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/itemviews/spreadsheet/spreadsheet.pro b/examples/itemviews/spreadsheet/spreadsheet.pro index f00dfb4c81..93fc5e95c6 100644 --- a/examples/itemviews/spreadsheet/spreadsheet.pro +++ b/examples/itemviews/spreadsheet/spreadsheet.pro @@ -1,17 +1,6 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Thu Mar 5 14:39:33 2009 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - QT += widgets printsupport -CONFIG += qt warn_on #unix:contains(QT_CONFIG, dbus):QT += dbus widgets -# Input HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h SOURCES += main.cpp \ printview.cpp \ @@ -20,7 +9,6 @@ SOURCES += main.cpp \ spreadsheetitem.cpp RESOURCES += spreadsheet.qrc - build_all:!build_pass { CONFIG -= build_all CONFIG += release diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro index 7c53044f69..3eabedd375 100644 --- a/examples/network/download/download.pro +++ b/examples/network/download/download.pro @@ -1,14 +1,6 @@ -###################################################################### -# Automatically generated by qmake (2.01a) fr. nov. 16 13:18:20 2007 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . QT = core network CONFIG += console -# Input SOURCES += main.cpp # install @@ -17,5 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/download INSTALLS += target sources - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro index 6b7e4f8757..04a6c4c4ea 100644 --- a/examples/network/downloadmanager/downloadmanager.pro +++ b/examples/network/downloadmanager/downloadmanager.pro @@ -1,14 +1,6 @@ -###################################################################### -# Automatically generated by qmake (2.01a) fr. nov. 16 14:11:36 2007 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . QT = core network CONFIG += console -# Input HEADERS += downloadmanager.h textprogressbar.h SOURCES += downloadmanager.cpp main.cpp textprogressbar.cpp @@ -18,7 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/downloadmanager INSTALLS += target sources - OTHER_FILES += \ debian/changelog \ debian/compat \ @@ -26,4 +17,5 @@ OTHER_FILES += \ debian/copyright \ debian/README \ debian/rules + simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/hellogl_es/hellogl_es.pro b/examples/opengl/hellogl_es/hellogl_es.pro index 6932b77831..ca0a4bf4cd 100644 --- a/examples/opengl/hellogl_es/hellogl_es.pro +++ b/examples/opengl/hellogl_es/hellogl_es.pro @@ -1,17 +1,12 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += gui -# Input SOURCES += main.cpp SOURCES += glwindow.cpp HEADERS += glwindow.h RESOURCES += texture.qrc -QT += gui -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro index d5bc7ba0a5..5a3d170df8 100644 --- a/examples/opengl/hellogl_es2/hellogl_es2.pro +++ b/examples/opengl/hellogl_es2/hellogl_es2.pro @@ -1,12 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Thu Oct 4 19:01:12 2007 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += opengl widgets -# Input SOURCES += main.cpp SOURCES += glwidget.cpp SOURCES += mainwindow.cpp @@ -17,7 +10,6 @@ HEADERS += mainwindow.h HEADERS += bubble.h RESOURCES += texture.qrc -QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es2 @@ -25,7 +17,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/hellogl_es2 INSTALLS += target sources - maemo5 { # Debian package name may not contain numbers or special characters # such as '_', lets change this in Maemo. diff --git a/examples/opengl/hellowindow/hellowindow.pro b/examples/opengl/hellowindow/hellowindow.pro index dc724421f5..b5ede1b83f 100644 --- a/examples/opengl/hellowindow/hellowindow.pro +++ b/examples/opengl/hellowindow/hellowindow.pro @@ -1,12 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Apr 27 16:40:46 2011 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . QT += gui-private core-private -# Input + HEADERS += hellowindow.h SOURCES += hellowindow.cpp main.cpp diff --git a/examples/opengl/paintedwindow/paintedwindow.pro b/examples/opengl/paintedwindow/paintedwindow.pro index a3ae3bace5..098329ac4d 100644 --- a/examples/opengl/paintedwindow/paintedwindow.pro +++ b/examples/opengl/paintedwindow/paintedwindow.pro @@ -1,12 +1,3 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Apr 27 16:40:46 2011 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - -# Input HEADERS += paintedwindow.h SOURCES += paintedwindow.cpp main.cpp @@ -15,4 +6,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/paintedwindow sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS paintedwindow.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/paintedwindow INSTALLS += target sources - diff --git a/examples/opengl/pbuffers2/pbuffers2.pro b/examples/opengl/pbuffers2/pbuffers2.pro index bc3b7bb692..ba3a039da2 100644 --- a/examples/opengl/pbuffers2/pbuffers2.pro +++ b/examples/opengl/pbuffers2/pbuffers2.pro @@ -1,14 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Fri May 12 17:15:46 2006 -###################################################################### - -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - QT += opengl svg widgets -# Input HEADERS += glwidget.h SOURCES += glwidget.cpp main.cpp RESOURCES += pbuffers2.qrc @@ -19,5 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl/pbuffers2 INSTALLS += target sources - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/qpa/windows/windows.pro b/examples/qpa/windows/windows.pro index ab59f28a3e..40280b718a 100644 --- a/examples/qpa/windows/windows.pro +++ b/examples/qpa/windows/windows.pro @@ -1,15 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Apr 27 16:40:46 2011 -###################################################################### +CONFIG += console +QT += gui-private core-private -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . -CONFIG+=console -QT += gui-private -QT += core-private - -# Input HEADERS += window.h SOURCES += window.cpp main.cpp diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro index b268aa75f2..b959915a55 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.pro +++ b/examples/qtconcurrent/imagescaling/imagescaling.pro @@ -1,20 +1,13 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . -QT += concurrent +QT += concurrent widgets -# Input SOURCES += main.cpp imagescaling.cpp HEADERS += imagescaling.h -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/imagescaling sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/imagescaling INSTALLS += target sources - wince*: DEPLOYMENT_PLUGIN += qgif qjpeg -QT += widgets simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro index 72f770755f..994c266e9b 100644 --- a/examples/qtconcurrent/map/map.pro +++ b/examples/qtconcurrent/map/map.pro @@ -1,14 +1,10 @@ TEMPLATE = app TARGET = mapdemo -DEPENDPATH += . -INCLUDEPATH += . QT += concurrent widgets +CONFIG += console -# Input SOURCES += main.cpp -CONFIG += console -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro index 75a3aba0ae..3ec3243b6a 100644 --- a/examples/qtconcurrent/progressdialog/progressdialog.pro +++ b/examples/qtconcurrent/progressdialog/progressdialog.pro @@ -1,17 +1,11 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += concurrent widgets +CONFIG += console -# Input SOURCES += main.cpp -CONFIG += console -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog INSTALLS += target sources -QT += concurrent widgets - simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro index f047577c9f..1ac02f6fa2 100644 --- a/examples/qtconcurrent/runfunction/runfunction.pro +++ b/examples/qtconcurrent/runfunction/runfunction.pro @@ -1,17 +1,11 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += concurrent widgets +CONFIG += console -# Input SOURCES += main.cpp -CONFIG += console -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction INSTALLS += target sources -QT += concurrent widgets - simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro index 3bddf1a862..8b6bf8104a 100644 --- a/examples/qtconcurrent/wordcount/wordcount.pro +++ b/examples/qtconcurrent/wordcount/wordcount.pro @@ -1,17 +1,11 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . +QT += concurrent widgets +CONFIG += console -# Input SOURCES += main.cpp -CONFIG += console -# install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount INSTALLS += target sources -QT += concurrent widgets - simulator: warning(This example does not work on Simulator platform) diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro index 6a3d63b641..29ef9b8334 100644 --- a/examples/threads/waitconditions/waitconditions.pro +++ b/examples/threads/waitconditions/waitconditions.pro @@ -1,16 +1,8 @@ -###################################################################### -# Automatically generated by qmake (1.08a) Fri Jan 7 15:25:07 2005 -###################################################################### - -TEMPLATE = app QT = core gui CONFIG -= moc app_bundle -DEPENDPATH += . -INCLUDEPATH += . +CONFIG += console -# Input SOURCES += waitconditions.cpp -CONFIG += qt warn_on create_prl link_prl console # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/waitconditions @@ -18,5 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS waitconditions.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/threads/waitconditions INSTALLS += target sources - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/validators/validators.pro b/examples/widgets/validators/validators.pro index f4cab8edac..7970f961cd 100644 --- a/examples/widgets/validators/validators.pro +++ b/examples/widgets/validators/validators.pro @@ -1,16 +1,8 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Tue Nov 28 13:20:04 2006 -###################################################################### - -TEMPLATE = app -TARGET = validators -DEPENDPATH += . -INCLUDEPATH += . +QT += widgets FORMS += validators.ui RESOURCES += validators.qrc -# Input SOURCES += main.cpp ledwidget.cpp localeselector.cpp HEADERS += ledwidget.h localeselector.h @@ -20,6 +12,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/validators INSTALLS += target sources -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) diff --git a/src/testlib/testlib.pro b/src/testlib/testlib.pro index 26769f95db..2f5b3229e4 100644 --- a/src/testlib/testlib.pro +++ b/src/testlib/testlib.pro @@ -13,7 +13,6 @@ unix:!embedded:QMAKE_PKGCONFIG_DESCRIPTION = Qt \ Testing \ Library -# Input HEADERS = qbenchmark.h \ qsignalspy.h \ qtestaccessible.h \ diff --git a/src/tools/moc/util/generate_keywords.pro b/src/tools/moc/util/generate_keywords.pro index eb04409922..88e5553f54 100644 --- a/src/tools/moc/util/generate_keywords.pro +++ b/src/tools/moc/util/generate_keywords.pro @@ -1,12 +1,4 @@ -###################################################################### -# Automatically generated by qmake (1.08a) Mon Feb 23 13:08:28 2004 -###################################################################### - -TEMPLATE = app CONFIG -= moc mac:CONFIG -= app_bundle -INCLUDEPATH += . -# Input SOURCES += generate_keywords.cpp -CONFIG += qt create_prl link_prl diff --git a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro index 19d36a63a1..799ef34559 100644 --- a/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro +++ b/tests/auto/corelib/kernel/qobject/signalbug/signalbug.pro @@ -1,6 +1,3 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . CONFIG -= app_bundle debug_and_release CONFIG += console DESTDIR = ./ @@ -8,7 +5,7 @@ QT -= gui wince*: { LIBS += coredll.lib } -# Input + HEADERS += signalbug.h SOURCES += signalbug.cpp diff --git a/tests/auto/gui/kernel/qclipboard/copier/copier.pro b/tests/auto/gui/kernel/qclipboard/copier/copier.pro index 1c188ca7de..def50b6476 100644 --- a/tests/auto/gui/kernel/qclipboard/copier/copier.pro +++ b/tests/auto/gui/kernel/qclipboard/copier/copier.pro @@ -1,9 +1,4 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . CONFIG -= app_bundle win32: DESTDIR = ../copier -# Input -SOURCES += main.cpp +SOURCES += main.cpp diff --git a/tests/auto/gui/kernel/qclipboard/paster/paster.pro b/tests/auto/gui/kernel/qclipboard/paster/paster.pro index 2f50eefb1e..ef91e77b6e 100644 --- a/tests/auto/gui/kernel/qclipboard/paster/paster.pro +++ b/tests/auto/gui/kernel/qclipboard/paster/paster.pro @@ -1,10 +1,4 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . win32: DESTDIR = ../paster CONFIG -= app_bundle -# Input -SOURCES += main.cpp - +SOURCES += main.cpp diff --git a/tests/auto/gui/painting/qpainter/utils/createImages/createImages.pro b/tests/auto/gui/painting/qpainter/utils/createImages/createImages.pro index ce2d341e92..36661c7d63 100644 --- a/tests/auto/gui/painting/qpainter/utils/createImages/createImages.pro +++ b/tests/auto/gui/painting/qpainter/utils/createImages/createImages.pro @@ -1,11 +1,3 @@ -###################################################################### -# Automatically generated by qmake (1.02a) Thu Apr 18 18:56:53 2002 -###################################################################### - -TEMPLATE = app CONFIG -= moc -# Input SOURCES += main.cpp - - diff --git a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro index 354e0e5cdf..101b7451de 100644 --- a/tests/auto/gui/text/qtextscriptengine/generate/generate.pro +++ b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro @@ -1,14 +1,5 @@ -###################################################################### -# Automatically generated by qmake (1.07a) Fri Sep 30 15:20:45 2005 -###################################################################### - -TEMPLATE = app CONFIG -= moc INCLUDEPATH += . /usr/include/freetype2 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src -# Input SOURCES += main.cpp -CONFIG += qt warn_on debug thread create_prl link_prl - - diff --git a/tests/auto/network/socket/qlocalsocket/example/client/client.pro b/tests/auto/network/socket/qlocalsocket/example/client/client.pro index 84f20d6ec0..4b6585ff10 100644 --- a/tests/auto/network/socket/qlocalsocket/example/client/client.pro +++ b/tests/auto/network/socket/qlocalsocket/example/client/client.pro @@ -1,10 +1,4 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . CONFIG += console QT = core network SOURCES += main.cpp - - diff --git a/tests/auto/network/socket/qlocalsocket/example/server/server.pro b/tests/auto/network/socket/qlocalsocket/example/server/server.pro index bfd14d2bb7..b78e63d0a7 100644 --- a/tests/auto/network/socket/qlocalsocket/example/server/server.pro +++ b/tests/auto/network/socket/qlocalsocket/example/server/server.pro @@ -1,13 +1,5 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - CONFIG += console QT = core network -# Input SOURCES += main.cpp - - diff --git a/tests/auto/other/atwrapper/atWrapper.pro b/tests/auto/other/atwrapper/atWrapper.pro index 5dcbdb98ce..9de320b364 100644 --- a/tests/auto/other/atwrapper/atWrapper.pro +++ b/tests/auto/other/atwrapper/atWrapper.pro @@ -1,9 +1,6 @@ -# -*- Mode: makefile -*- - ARTHUR=$$QT_SOURCE_TREE/tests/arthur COMMON_FOLDER = $$ARTHUR/common include($$ARTHUR/arthurtester.pri) -TEMPLATE = app INCLUDEPATH += $$ARTHUR DEFINES += SRCDIR=\\\"$$PWD\\\" @@ -15,7 +12,6 @@ include($$ARTHUR/datagenerator/datagenerator.pri) CONFIG += testcase -# Input HEADERS += atWrapper.h SOURCES += atWrapperAutotest.cpp atWrapper.cpp diff --git a/tests/auto/other/macgui/macgui.pro b/tests/auto/other/macgui/macgui.pro index 5632450a3a..b7adbb470e 100644 --- a/tests/auto/other/macgui/macgui.pro +++ b/tests/auto/other/macgui/macgui.pro @@ -1,10 +1,6 @@ CONFIG += testcase TARGET = tst_macgui -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . -# Input SOURCES += tst_macgui.cpp guitest.cpp HEADERS += guitest.h diff --git a/tests/auto/other/macnativeevents/macnativeevents.pro b/tests/auto/other/macnativeevents/macnativeevents.pro index efe091f9f0..6ec0942222 100644 --- a/tests/auto/other/macnativeevents/macnativeevents.pro +++ b/tests/auto/other/macnativeevents/macnativeevents.pro @@ -1,7 +1,3 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Nov 29 22:24:47 2006 -###################################################################### - CONFIG += testcase TARGET = tst_macnativeevents TEMPLATE = app diff --git a/tests/auto/other/macplist/app/app.pro b/tests/auto/other/macplist/app/app.pro index b4b895197c..9ccac831d0 100644 --- a/tests/auto/other/macplist/app/app.pro +++ b/tests/auto/other/macplist/app/app.pro @@ -1,12 +1,3 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Jan 7 13:01:11 2009 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . +QT += widgets -# Input SOURCES += main.cpp -QT += widgets diff --git a/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro b/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro index 644a817a8e..e4f81e6e1e 100644 --- a/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro +++ b/tests/auto/tools/qmake/testdata/bundle-spaces/bundle-spaces.pro @@ -1,9 +1,3 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input SOURCES += main.cpp QWERTY_BUNDLE.version = Bogus.78 diff --git a/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro b/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro index 43577b5122..442c9c767f 100644 --- a/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro +++ b/tests/auto/tools/qmake/testdata/findDeps/findDeps.pro @@ -1,10 +1,5 @@ -TEMPLATE = app -TARGET = findDeps -DEPENDPATH += . -INCLUDEPATH += . DESTDIR = ./ -# Input HEADERS += object1.h \ object2.h \ object3.h \ diff --git a/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro b/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro index 1469b4c5c3..a4a7dc987d 100644 --- a/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro +++ b/tests/auto/tools/qmake/testdata/findMocs/findMocs.pro @@ -1,9 +1,4 @@ -TEMPLATE = app -TARGET = findMocs -DEPENDPATH += . -INCLUDEPATH += . DESTDIR = ./ -# Input HEADERS += object1.h object2.h object3.h object4.h object5.h object6.h object7.h SOURCES += main.cpp diff --git a/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro b/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro index 730932d83d..b4cf05e347 100644 --- a/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro +++ b/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro @@ -1,10 +1,7 @@ CONFIG += testcase TEMPLATE = app TARGET = tst_qerrormessage -DEPENDPATH += . -INCLUDEPATH += . QT += widgets testlib -# Input SOURCES += tst_qerrormessage.cpp diff --git a/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro b/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro index 5b8f796485..91848fee24 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro +++ b/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro @@ -1,9 +1,6 @@ -CONFIG += testcase TEMPLATE = app TARGET = tst_qmessagebox QT += gui-private core-private widgets testlib -DEPENDPATH += . -INCLUDEPATH += . +CONFIG += testcase -# Input SOURCES += tst_qmessagebox.cpp diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro index 3b229e31cb..97768eac74 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro @@ -1,15 +1,6 @@ -###################################################################### -# Automatically generated by qmake (2.00a) Mon Jul 11 11:30:34 2005 -###################################################################### +QT += widgets +CONFIG -= app_bundle -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . DESTDIR = ./ -# Input -QT += widgets SOURCES += main.cpp -CONFIG += qt warn_on create_prl link_prl -CONFIG -= app_bundle - diff --git a/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro b/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro index cadc6d6ddc..bf12a6b30f 100644 --- a/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro +++ b/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro @@ -1,12 +1,7 @@ -###################################################################### -# Automatically generated by qmake (2.00a) ti 8. mar 16:20:21 2005 -###################################################################### +TEMPLATE = app +TARGET = tst_qstyleoption CONFIG += testcase -TARGET = tst_qstyleoption -TEMPLATE = app QT += widgets testlib -# Input -SOURCES += tst_qstyleoption.cpp - +SOURCES += tst_qstyleoption.cpp diff --git a/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro index f908c3ab7d..dd17183b30 100644 --- a/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro +++ b/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro @@ -1,10 +1,10 @@ CONFIG += testcase TARGET = tst_qstylesheetstyle -QT += widgets widgets-private testlib -QT += gui-private -# Input +QT += widgets widgets-private gui-private testlib + SOURCES += tst_qstylesheetstyle.cpp RESOURCES += resources.qrc + requires(contains(QT_CONFIG,private_tests)) win32:CONFIG += insignificant_test # QTBUG-24323 diff --git a/tests/auto/widgets/util/qcompleter/qcompleter.pro b/tests/auto/widgets/util/qcompleter/qcompleter.pro index 63b137eb7c..6a817a89ac 100644 --- a/tests/auto/widgets/util/qcompleter/qcompleter.pro +++ b/tests/auto/widgets/util/qcompleter/qcompleter.pro @@ -2,10 +2,7 @@ CONFIG += testcase TEMPLATE = app TARGET = tst_qcompleter QT += widgets testlib -DEPENDPATH += . -INCLUDEPATH += . .. -# Input SOURCES += tst_qcompleter.cpp CONFIG += insignificant_test # QTBUG-21424 diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro index 93167f81c8..f801200942 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro +++ b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro @@ -1,15 +1,4 @@ -###################################################################### -# Automatically generated by qmake (1.06a) Thu Jun 5 19:00:42 2003 -###################################################################### - -TEMPLATE = app -INCLUDEPATH += . +QT += xml -# Input HEADERS += parser.h SOURCES += main.cpp parser.cpp - -CONFIG += qt warn_on debug -QT += xml - - diff --git a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro index cec33ded18..dc579ab742 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro +++ b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro @@ -4,7 +4,6 @@ TEMPLATE = app DEPENDPATH += parser INCLUDEPATH += . parser -# Input HEADERS += parser/parser.h SOURCES += tst_qxmlsimplereader.cpp parser/parser.cpp 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 diff --git a/tests/manual/gestures/graphicsview/graphicsview.pro b/tests/manual/gestures/graphicsview/graphicsview.pro index a40c323eb3..c5f6fe0764 100644 --- a/tests/manual/gestures/graphicsview/graphicsview.pro +++ b/tests/manual/gestures/graphicsview/graphicsview.pro @@ -1,12 +1,3 @@ -# ##################################################################### -# Automatically generated by qmake (2.01a) Mon Sep 7 13:26:43 2009 -# ##################################################################### -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input SOURCES += main.cpp \ imageitem.cpp \ gestures.cpp \ diff --git a/tests/manual/lance/lance.pro b/tests/manual/lance/lance.pro index 7eee7ec2de..e24d3f2fa3 100644 --- a/tests/manual/lance/lance.pro +++ b/tests/manual/lance/lance.pro @@ -4,7 +4,6 @@ TEMPLATE = app INCLUDEPATH += . $$LANCELOT_DIR QT += core-private gui-private -# Input HEADERS += widgets.h \ interactivewidget.h \ $$LANCELOT_DIR/paintcommands.h diff --git a/tests/manual/qgraphicslayout/flicker/flicker.pro b/tests/manual/qgraphicslayout/flicker/flicker.pro index 323a30f7bf..2e09826022 100644 --- a/tests/manual/qgraphicslayout/flicker/flicker.pro +++ b/tests/manual/qgraphicslayout/flicker/flicker.pro @@ -1,8 +1,2 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input HEADERS += window.h SOURCES += main.cpp window.cpp diff --git a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro index d73124c8f9..fd21007793 100644 --- a/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/manual/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -1,13 +1,10 @@ CONFIG += testcase TEMPLATE = app TARGET = tst_qhttpnetworkconnection -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/manual/qimagereader/qimagereader.pro b/tests/manual/qimagereader/qimagereader.pro index b8293b9552..28dcadcbfa 100644 --- a/tests/manual/qimagereader/qimagereader.pro +++ b/tests/manual/qimagereader/qimagereader.pro @@ -1,8 +1 @@ - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input SOURCES += main.cpp diff --git a/tests/manual/qlocale/qlocale.pro b/tests/manual/qlocale/qlocale.pro index e9f17f4f9f..4eaddedcf0 100644 --- a/tests/manual/qlocale/qlocale.pro +++ b/tests/manual/qlocale/qlocale.pro @@ -1,8 +1,2 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input HEADERS += currency.h calendar.h dateformats.h numberformats.h languages.h window.h miscellaneous.h info.h SOURCES += currency.cpp main.cpp calendar.cpp dateformats.cpp numberformats.cpp languages.cpp window.cpp miscellaneous.cpp info.cpp diff --git a/tests/manual/qnetworkaccessmanager/qget/qget.pro b/tests/manual/qnetworkaccessmanager/qget/qget.pro index 341f772b51..1f2b497171 100644 --- a/tests/manual/qnetworkaccessmanager/qget/qget.pro +++ b/tests/manual/qnetworkaccessmanager/qget/qget.pro @@ -2,6 +2,5 @@ TEMPLATE = app QT = core network CONFIG += console -# Input SOURCES += qget.cpp HEADERS += qget.h diff --git a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro index 613fcd85e4..7ad271ce46 100644 --- a/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro +++ b/tests/manual/qnetworkconfigurationmanager/qnetworkconfigurationmanager.pro @@ -1,13 +1,10 @@ CONFIG += testcase TEMPLATE = app TARGET = tst_qnetworkconfigurationmanager -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/manual/qnetworkreply/qnetworkreply.pro b/tests/manual/qnetworkreply/qnetworkreply.pro index 479a1e63bc..17f48c6544 100644 --- a/tests/manual/qnetworkreply/qnetworkreply.pro +++ b/tests/manual/qnetworkreply/qnetworkreply.pro @@ -1,13 +1,10 @@ CONFIG += testcase TEMPLATE = app TARGET = tst_qnetworkreply -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/tests/manual/qtabletevent/device_information/qtabletevent.pro b/tests/manual/qtabletevent/device_information/qtabletevent.pro index e0ed549004..8251d73094 100644 --- a/tests/manual/qtabletevent/device_information/qtabletevent.pro +++ b/tests/manual/qtabletevent/device_information/qtabletevent.pro @@ -1,13 +1,5 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Mon Aug 10 17:02:09 2009 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input -SOURCES += main.cpp\ +SOURCES += \ + main.cpp \ tabletwidget.cpp -HEADERS += tabletwidget.h +HEADERS += \ + tabletwidget.h diff --git a/tests/manual/qtabletevent/event_compression/event_compression.pro b/tests/manual/qtabletevent/event_compression/event_compression.pro index 273fd6c1b0..fd2521e44f 100644 --- a/tests/manual/qtabletevent/event_compression/event_compression.pro +++ b/tests/manual/qtabletevent/event_compression/event_compression.pro @@ -1,7 +1,5 @@ -TEMPLATE = app QT += testlib -# Input SOURCES += main.cpp \ mousestatwidget.cpp HEADERS += mousestatwidget.h diff --git a/tests/manual/qwidget_zorder/qwidget_zorder.pro b/tests/manual/qwidget_zorder/qwidget_zorder.pro index 5526f9161f..28dcadcbfa 100644 --- a/tests/manual/qwidget_zorder/qwidget_zorder.pro +++ b/tests/manual/qwidget_zorder/qwidget_zorder.pro @@ -1,6 +1 @@ -TEMPLATE = app -DEPENDPATH += . -INCLUDEPATH += . - -# Input SOURCES += main.cpp diff --git a/tests/manual/repaint/mainwindow/mainwindow.pro b/tests/manual/repaint/mainwindow/mainwindow.pro index c269d57eff..db6b2d280c 100644 --- a/tests/manual/repaint/mainwindow/mainwindow.pro +++ b/tests/manual/repaint/mainwindow/mainwindow.pro @@ -1,15 +1,2 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Nov 8 15:46:28 2006 -###################################################################### - -TEMPLATE = app -TARGET = mainwindow -DEPENDPATH += . -INCLUDEPATH += . - -# Input HEADERS += ../shared/shared.h SOURCES += main.cpp -CONFIG += qt warn_on debug create_prl link_prl -OBJECTS_DIR = .obj/debug-shared -MOC_DIR = .moc/debug-shared diff --git a/tests/manual/repaint/scrollarea/scrollarea.pro b/tests/manual/repaint/scrollarea/scrollarea.pro index e1a40ad6ad..db6b2d280c 100644 --- a/tests/manual/repaint/scrollarea/scrollarea.pro +++ b/tests/manual/repaint/scrollarea/scrollarea.pro @@ -1,15 +1,2 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Nov 8 15:28:57 2006 -###################################################################### - -TEMPLATE = app -TARGET = scrollarea -DEPENDPATH += . -INCLUDEPATH += . - -# Input HEADERS += ../shared/shared.h SOURCES += main.cpp -CONFIG += qt warn_on debug create_prl link_prl -OBJECTS_DIR = .obj/debug-shared -MOC_DIR = .moc/debug-shared diff --git a/tests/manual/repaint/splitter/splitter.pro b/tests/manual/repaint/splitter/splitter.pro index 0afc0630ba..db6b2d280c 100644 --- a/tests/manual/repaint/splitter/splitter.pro +++ b/tests/manual/repaint/splitter/splitter.pro @@ -1,15 +1,2 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Wed Nov 8 15:39:53 2006 -###################################################################### - -TEMPLATE = app -TARGET = splitter -DEPENDPATH += . -INCLUDEPATH += . - -# Input HEADERS += ../shared/shared.h SOURCES += main.cpp -CONFIG += qt warn_on debug create_prl link_prl -OBJECTS_DIR = .obj/debug-shared -MOC_DIR = .moc/debug-shared diff --git a/tests/manual/repaint/tableview/tableview.pro b/tests/manual/repaint/tableview/tableview.pro index 4fccf4abc9..4097c95739 100644 --- a/tests/manual/repaint/tableview/tableview.pro +++ b/tests/manual/repaint/tableview/tableview.pro @@ -1,8 +1,2 @@ HEADERS +=../shared/shared.h -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - -# Input SOURCES += main.cpp diff --git a/tests/manual/repaint/task141091/task141091.pro b/tests/manual/repaint/task141091/task141091.pro index db89bd35b8..82ead4b6c2 100644 --- a/tests/manual/repaint/task141091/task141091.pro +++ b/tests/manual/repaint/task141091/task141091.pro @@ -1,12 +1,3 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Tue Mar 6 13:44:00 2007 -###################################################################### +CONFIG += console -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . -CONFIG+=console - -# Input SOURCES += main.cpp diff --git a/tests/manual/repaint/toplevel/toplevel.pro b/tests/manual/repaint/toplevel/toplevel.pro index 568ea8e062..c2cc19f67d 100644 --- a/tests/manual/repaint/toplevel/toplevel.pro +++ b/tests/manual/repaint/toplevel/toplevel.pro @@ -1,16 +1,4 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Tue Nov 7 10:15:42 2006 -###################################################################### - -TEMPLATE = app -TARGET = toplevel -DEPENDPATH += . -INCLUDEPATH += . CONFIG += console -# Input HEADERS += ../shared/shared.h SOURCES += main.cpp -CONFIG += qt warn_on debug create_prl link_prl -OBJECTS_DIR = .obj/debug-shared -MOC_DIR = .moc/debug-shared diff --git a/tests/manual/repaint/widget/widget.pro b/tests/manual/repaint/widget/widget.pro index c9d8f872e8..db6b2d280c 100644 --- a/tests/manual/repaint/widget/widget.pro +++ b/tests/manual/repaint/widget/widget.pro @@ -1,15 +1,2 @@ -###################################################################### -# Automatically generated by qmake (2.01a) Tue Nov 7 11:16:05 2006 -###################################################################### - -TEMPLATE = app -TARGET = widget -DEPENDPATH += . -INCLUDEPATH += . - -# Input HEADERS += ../shared/shared.h SOURCES += main.cpp -CONFIG += qt warn_on debug create_prl link_prl -OBJECTS_DIR = .obj/debug-shared -MOC_DIR = .moc/debug-shared diff --git a/tests/manual/socketengine/socketengine.pro b/tests/manual/socketengine/socketengine.pro index 24523e9ca4..808502c22a 100644 --- a/tests/manual/socketengine/socketengine.pro +++ b/tests/manual/socketengine/socketengine.pro @@ -1,13 +1,10 @@ CONFIG += testcase TEMPLATE = app TARGET = tst_socketengine -DEPENDPATH += . -INCLUDEPATH += . QT -= gui QT += network testlib CONFIG += release -# Input SOURCES += main.cpp diff --git a/util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro b/util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro index 9d5f1cf7f9..99723b7c0f 100644 --- a/util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro +++ b/util/corelib/qurl-generateTLDs/qurl-generateTLDs.pro @@ -1,9 +1,3 @@ -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += . - QT = core -# Input SOURCES += main.cpp diff --git a/util/unicode/codecs/big5/big5.pro b/util/unicode/codecs/big5/big5.pro index 84cf33033c..a42176bb6b 100644 --- a/util/unicode/codecs/big5/big5.pro +++ b/util/unicode/codecs/big5/big5.pro @@ -1,6 +1,4 @@ -TEMPLATE = app CONFIG -= moc -# Input SOURCES += main.cpp RESOURCES += big5.qrc |