summaryrefslogtreecommitdiffstats
path: root/tools/makeqpf
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-14 16:31:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-14 16:31:33 (GMT)
commit780c0df56bc93fda950ce6fc4794d99629fc64c2 (patch)
tree872d071a014dbe4047ffb6b720531db3bedbb42c /tools/makeqpf
parent03eae990b1aea880ee863061e1429edc4a96c626 (diff)
parentbe41deb3868de28187aba5743f71a71f8498e4c7 (diff)
downloadQt-780c0df56bc93fda950ce6fc4794d99629fc64c2.zip
Qt-780c0df56bc93fda950ce6fc4794d99629fc64c2.tar.gz
Qt-780c0df56bc93fda950ce6fc4794d99629fc64c2.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix regexp fix path separators in install targets for MinGW+sh fix QMAKE_QMAKE path separator under mingw+sh in the qmake spec define qtPrepareTool() function and use it throughout QNAM HTTP: And one more testcase QNetworkAccessManager: Backends were tried in wrong order
Diffstat (limited to 'tools/makeqpf')
0 files changed, 0 insertions, 0 deletions