summaryrefslogtreecommitdiffstats
path: root/tools/runonphone/runonphone.pro
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-11 06:09:18 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-11 06:09:18 (GMT)
commit9a76a90b1944db52bd4180d27c01781fbb3499d4 (patch)
tree46ac1557761e30127330520d2fa6412305e07443 /tools/runonphone/runonphone.pro
parentb5fe99c0105a9791e34a8b959822430497a4aeb9 (diff)
parentb9907e309885b4b8ce280c721231a56a583b51d0 (diff)
downloadQt-9a76a90b1944db52bd4180d27c01781fbb3499d4.zip
Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.tar.gz
Qt-9a76a90b1944db52bd4180d27c01781fbb3499d4.tar.bz2
Merge remote branch 'origin/4.6' into bearermanagement/integration
Conflicts: src/s60installs/s60installs.pro
Diffstat (limited to 'tools/runonphone/runonphone.pro')
-rw-r--r--tools/runonphone/runonphone.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/runonphone/runonphone.pro b/tools/runonphone/runonphone.pro
index 2c1be98..7bed3e5 100644
--- a/tools/runonphone/runonphone.pro
+++ b/tools/runonphone/runonphone.pro
@@ -4,7 +4,7 @@ QT -= gui
CONFIG += console
CONFIG -= app_bundle
-include(trk/trk.pri)
+include(symbianutils/symbianutils.pri)
SOURCES += main.cpp \
trksignalhandler.cpp
@@ -12,6 +12,8 @@ SOURCES += main.cpp \
HEADERS += trksignalhandler.h \
serenum.h
+DEFINES += SYMBIANUTILS_INCLUDE_PRI
+
windows {
SOURCES += serenum_win.cpp
LIBS += -lsetupapi \