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 --- examples/dbus/complexpingpong/complexping.pro | 5 ----- examples/dbus/complexpingpong/complexpong.pro | 5 ----- examples/dbus/dbus-chat/dbus-chat.pro | 6 +----- examples/dbus/listnames/listnames.pro | 5 ----- examples/dbus/pingpong/ping.pro | 6 ------ examples/dbus/pingpong/pong.pro | 6 ------ examples/dbus/remotecontrolledcar/car/car.pro | 10 +--------- examples/dbus/remotecontrolledcar/controller/controller.pro | 10 +--------- 8 files changed, 3 insertions(+), 50 deletions(-) (limited to 'examples/dbus') 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) -- cgit v1.2.3