summaryrefslogtreecommitdiffstats
path: root/src/script
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-21 17:01:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-21 17:01:35 (GMT)
commit19924c1373e6acdf4ebf8cf61c51f3cdf32978b3 (patch)
treecc40a0c10a15e954a250bdca25b099dc67184c65 /src/script
parent3a7b70637f94a85702c6578bb13a1e6594358d08 (diff)
parentccfb67704285f60ce31bb05538f08ca6f32c6f1d (diff)
downloadQt-19924c1373e6acdf4ebf8cf61c51f3cdf32978b3.zip
Qt-19924c1373e6acdf4ebf8cf61c51f3cdf32978b3.tar.gz
Qt-19924c1373e6acdf4ebf8cf61c51f3cdf32978b3.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: Made developer builds use the build dir as prefix, also on Symbian. Fixed the definitions of file locations on Symbian using configure.sh Added automatic sqlite extraction for Symbian to QtWebKit. Added missing header to qstring.cpp. Fixed automatic sqlite extraction on Symbian makefile build system. Removed the need to specify -arch symbian when compiling on Linux. Fixed QT_NO_FREETYPE define. Various configure fixes to make Qt compile with Raptor on Linux. Fixed a parsing error during sis and runonphone target creation.
Diffstat (limited to 'src/script')
0 files changed, 0 insertions, 0 deletions