summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-21 13:39:27 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-21 13:39:27 (GMT)
commit9dbba618af3b505c0aac590d0b0ec32eabb76d76 (patch)
tree9de626bea521d94c6e2a418d86d1934c067e8e7c /src/tools
parent55fb13a62a531a7400f8dc602fde5f2529aaaad4 (diff)
parentaea135e1b1dad919229c9bfde248f8bb615c3c5d (diff)
downloadQt-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 'src/tools')
0 files changed, 0 insertions, 0 deletions