diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /examples/dbus/pingpong | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'examples/dbus/pingpong')
| -rw-r--r-- | examples/dbus/pingpong/ping.pro | 6 | ||||
| -rw-r--r-- | examples/dbus/pingpong/pong.pro | 6 |
2 files changed, 0 insertions, 12 deletions
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 |