summaryrefslogtreecommitdiffstats
path: root/tests/auto/q3dockwindow
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-29 21:38:31 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-29 21:38:31 (GMT)
commit587b0fed9bd17a378eb0212c95074df965549ef2 (patch)
treead5071ee13c83804c782646433d32f5e002af245 /tests/auto/q3dockwindow
parentb4afd4e4cabce0347e155803afd8ff1a7b90f080 (diff)
parent05f4d51a69516aa585f9941960afd483325e562f (diff)
downloadQt-587b0fed9bd17a378eb0212c95074df965549ef2.zip
Qt-587b0fed9bd17a378eb0212c95074df965549ef2.tar.gz
Qt-587b0fed9bd17a378eb0212c95074df965549ef2.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: Fixed deployment paths for WebKit declarative plugin. Fix s60main linking issue with gcce applications Fixed deployment paths for the symbian/linux-armcc mkspec. Fixed a relative path problem in qml demos. Added the APP_PRIVATE_DIR_BASE variable. Various fixes to autotests when using the symbian/linux-armcc mkspec. Fixed Symbian resources not honoring TARGET with a path. Removed useless comments.
Diffstat (limited to 'tests/auto/q3dockwindow')
0 files changed, 0 insertions, 0 deletions