diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-21 13:39:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-21 13:39:27 (GMT) |
| commit | 9dbba618af3b505c0aac590d0b0ec32eabb76d76 (patch) | |
| tree | 9de626bea521d94c6e2a418d86d1934c067e8e7c /tools/runonphone/runonphone.pro | |
| parent | 55fb13a62a531a7400f8dc602fde5f2529aaaad4 (diff) | |
| parent | aea135e1b1dad919229c9bfde248f8bb615c3c5d (diff) | |
| download | Qt-9dbba618af3b505c0aac590d0b0ec32eabb76d76.zip Qt-9dbba618af3b505c0aac590d0b0ec32eabb76d76.tar.gz Qt-9dbba618af3b505c0aac590d0b0ec32eabb76d76.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusion
Use libusb to auto-detect the port to use to communicate with the phone
Whitespace
Make multimedia only depend on opengl when the latter is build
gcc for Symbian doesn't support gcc extensions like atomicity.h - disable
Diffstat (limited to 'tools/runonphone/runonphone.pro')
| -rw-r--r-- | tools/runonphone/runonphone.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/runonphone/runonphone.pro b/tools/runonphone/runonphone.pro index 7bed3e5..0c63723 100644 --- a/tools/runonphone/runonphone.pro +++ b/tools/runonphone/runonphone.pro @@ -22,7 +22,10 @@ windows { } else:unix:!symbian { SOURCES += serenum_unix.cpp + LIBS += -lusb } else { SOURCES += serenum_stub.cpp } + + |