summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* qt project files: create pkg-config files for mingwMark Brand2011-01-1022-23/+29
* qmake: write and install pkg-config files for mingwMark Brand2011-01-102-0/+15
* qmake: don't limit pkg-config writing to unix generatorMark Brand2011-01-104-182/+183
* qmake: fix double directory separatorMark Brand2011-01-101-2/+7
* Fix reversed condition introduced in 9a6cfc07e5João Abecasis2011-01-101-1/+1
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-085-5/+12
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-075-5/+12
| |\
| | * Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higherminiak2011-01-073-3/+3
| | * Fix compilation error on SolarisJoão Abecasis2011-01-071-0/+6
| | * Check elapsed time only onceJoão Abecasis2011-01-071-2/+3
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-088-17/+27
|\ \ \ | |/ / |/| |
| * | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-078-17/+27
| |\ \
| | * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-078-17/+27
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-071-2/+0
| | | |\ \
| | | | * | QmlViewer: Remove unused class variablesKai Koehne2011-01-071-2/+0
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-072-5/+6
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fixed bug and performance problem in windowsstyle.Samuel Rødal2011-01-071-2/+2
| | | | * | Restored old flushing behavior in -graphicssystem opengl on desktop.Samuel Rødal2011-01-071-3/+4
| | | |/ /
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-01-061-2/+4
| | | |\ \
| | | | * | Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANsShane Kearns2011-01-061-2/+4
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-01-064-8/+17
| | | |\ \ \
| | | | * | | Designer: Block QEvent::WinIdChange.Friedemann Kleint2011-01-061-0/+1
| | | | * | | QUrl::setUrl should call detachOlivier Goffart2011-01-062-0/+9
| | | | * | | qkeymapper_x11.cpp: fix compilation with LSB and without XKBOlivier Goffart2011-01-061-8/+7
| | | | |/ /
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-074-71/+140
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2aavit2011-01-07260-5879/+88973
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge branch 'lancelot'aavit2011-01-074-71/+140
| |\ \ \ \ \
| | * | | | | Added api for efficient data driven baseline testingaavit2011-01-073-63/+133
| | * | | | | Need not keep client waiting until server has savedaavit2010-12-161-8/+7
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-01-072-26/+21
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Assistant: Fix warnings.Christian Kandeler2011-01-072-23/+19
| * | | | | Assistant: Don't tabify "Open Pages" dock widget by default.Christian Kandeler2011-01-071-3/+2
|/ / / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-01-072-42/+41
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-01-062-42/+41
| |\ \ \ \ \
| | * \ \ \ \ Merge commit 'qt-releng-review/master'Eckhart Koppen2011-01-062-42/+41
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-061-124/+0
| | | |\ \ \ \ \
| | | | * | | | | Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF fileEckhart Koppen2011-01-061-124/+0
| | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-062-39/+162
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Updated QTOpenGL DEF files for WINSCW and ARMV5Eckhart Koppen2011-01-062-39/+162
| | | * | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-01-06185-4660/+8360
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Updated DEF files for QtOpenGL for WINSCW and ARMV5Eckhart Koppen2011-01-052-2/+2
| | | | * | | | | Merge commit 'qt-master/master'Eckhart Koppen2011-01-05196-5364/+8752
| | | | |\ \ \ \ \
* | | | | \ \ \ \ \ Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-078-118/+221
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-068-118/+221
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / /
| * | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-068-118/+221
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-065-2/+83
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | PathView crashed when the path is provided with undefined values.Martin Jones2011-01-063-1/+38
| | | * | | | | | | PathView: update modelCount before attempting to regenerate delegates.Martin Jones2011-01-063-1/+45
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-01-063-116/+138
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8