summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-108-14/+42
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-11-096-11/+38
| |\
| | * Fixed deployment for symbian/linux-armcc when using shadow builds.axis2010-11-092-5/+13
| | * Started using qtmain.lib for all Qt applications, also corelib ones.axis2010-11-095-6/+25
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-092-3/+4
| |\ \ | | |/ | |/|
| | * Really fix getting qmakespec on windowsaavit2010-11-092-3/+4
| |/
* | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-0914-164/+222
|\ \ | |/
| * Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-081-1/+1
| |\
| | * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-081-1/+1
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-081-1/+1
| | | |\
| | | | * Task-number: QTBUG-15059juhvu2010-11-081-1/+1
| | | |/
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-081-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | Get the qmakespec correctly on all platformsaavit2010-11-081-1/+3
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0813-163/+219
| |\ \ \ | | |/ /
| | * | Revert "QPointer: assert when using QPointer on destroyed QObject"Olivier Goffart2010-11-081-2/+0
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0614-163/+221
| | |\ \ | |/ / /
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0614-163/+221
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-11-0514-163/+221
| | | |\ \
| | | | * | Silence warning in qvector with MSVCOlivier Goffart2010-11-051-3/+3
| | | | * | QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetS...Olivier Goffart2010-11-053-85/+106
| | | | * | QStyleSheetStyle: add a way to style the up arrowOlivier Goffart2010-11-051-0/+4
| | | | * | QPointer: assert when using QPointer on destroyed QObjectOlivier Goffart2010-11-051-0/+2
| | | | * | Add missing Q_ENUMS to QAbstractSocketOlivier Goffart2010-11-051-0/+1
| | | | * | Fix QMenu rendering in the unified toolbarFabien Freling2010-11-051-3/+8
| | | | * | Merge branch 'lancelot'aavit2010-11-057-72/+97
| | | | |\ \
| | | | | * | Add even more platform info, and make it expandable.aavit2010-11-057-69/+89
| | | | | * | Hide nonfunctional links, and improve htmlaavit2010-11-031-3/+8
* | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-11-07191-1898/+23784
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-11-062-2/+84
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-062-2/+84
| | |\ \ \ \ \ | |/ / / / / / | | | | | | _
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-11-051-2/+3
| | |\ \ \ \
| | | * | | | Hide the cursor in the tested text editHarald Fernengel2010-11-051-2/+3
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-11-051-0/+81
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | tst_qnetworkreply: New HTTP test with AuthenticationReuseAttributeMarkus Goetz2010-11-051-0/+29
| | | * | | | tst_qnetworkreply: One more HTTP test using setReadBufferSize()Markus Goetz2010-11-051-0/+52
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-06118-1421/+20901
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-05118-1421/+20901
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.confTor Arne Vestbø2010-11-053-13/+10
| | | * | | | | mkspecs: Make linux-x86-openkode-g++ not include g++.conf directlyTor Arne Vestbø2010-11-051-1/+2
| | | * | | | | mkspecs: Include gcc-base-unix.conf from g++.conf to match old behaviorTor Arne Vestbø2010-11-051-2/+3
| | | * | | | | configure: Deal with multiple redefinitions of qmake variablesTor Arne Vestbø2010-11-051-14/+24
| | | * | | | | Split QScriptValue::call autotest into smaller tests.Jedrzej Nowacki2010-11-052-131/+173
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-05117-1267/+20696
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-05117-1267/+20696
| | | | |\ \ \ \
| | | | | * | | | Optimize and clean up QClipData::fixup()Andreas Kling2010-11-041-18/+20
| | | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-04116-1249/+20676
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-04116-1249/+20676
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-03117-1249/+20678
| | | | | | | |\ \ \ \
| | | | | | | | * | | | There is no predefined qmake x11 scope for x11 builds.Robert Griebl2010-11-032-0/+4
| | | | | | | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-11-03115-1249/+20674
| | | | | | | | |\ \ \ \