summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1524-124/+296
|\
| * QListView: Re-fix scrollbar rangesGabriel de Dietrich2010-04-152-4/+40
| * Fix compile error with QT_NO_GRAPHICSVIEW in QtMultimediaTasuku Suzuki2010-04-153-1/+23
| * Fix compile error with QT_NO_IMAGEFORMAT_XPM in QtGuiTasuku Suzuki2010-04-152-0/+4
| * Wrap EGL image function pointers and move into QEgl namespaceTom Cooksey2010-04-154-32/+49
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1515-87/+180
| |\
| | * Fix compilation of ShivaVG, which does not have EGL.Rhys Weatherley2010-04-151-0/+2
| | * Move nativePaintingActive flag to GL2 engine's privateTom Cooksey2010-04-142-9/+10
| | * More adjustments to QTBUG-6800Carolina Gomes2010-04-143-13/+11
| | * Adjustments to QTBUG-6800 patch.Carolina Gomes2010-04-141-8/+6
| | * QTBUG-6800 patch included, but only for OpenGL 2.0Carolina Gomes2010-04-143-1/+39
| | * Support building with desktop OpenGL managed via EGLTom Cooksey2010-04-149-84/+130
| | * Print more information when debugging X11 Visual selectionTom Cooksey2010-04-141-0/+10
| | * Fix gcc compile warning in qstatictext.cppEskil Abrahamsen Blomfeldt2010-04-141-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-304669-165340/+343604
| | |\
| | * | Avoid taking sqrt of negative number in FT font engineEskil Abrahamsen Blomfeldt2010-03-301-1/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-151-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Shouldn't call epocRoot() in non-epoc builds in generatePkgFileMiikka Heikkinen2010-04-151-1/+3
* | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-1522-65/+344
|\ \ \ \
| * \ \ \ Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-1422-65/+344
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-1422-65/+344
| | |\ \ \
| | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-1314-8/+133
| | | |\ \ \
| | | | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-1314-8/+133
| | | | |\ \ \
| | | | | * | | Fix QNX screen initializationJohannes Zellner2010-04-131-1/+1
| | | | | * | | tst_qftp: Attempting to reproduce a crashMarkus Goetz2010-04-131-0/+26
| | | | | * | | QNAM HTTP: Do not pipeline with WebLogic serversMarkus Goetz2010-04-131-0/+2
| | | | | * | | Autotest: update path location on the test serverThiago Macieira2010-04-133-3/+3
| | | | | * | | Autotest: update location of fluke.gif on test serverThiago Macieira2010-04-131-1/+1
| | | | | * | | Make qsTr work in global scopeKent Hansen2010-04-137-3/+100
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-131-0/+25
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Provide overview for Symbian capabilities.Frans Englich2010-04-131-0/+25
| | | |/ / / /
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-133-3/+15
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6Sami Merila2010-04-135-5/+12
| | | | |\ \ \
| | | | | * | | Export .flm files always if they are differentMiikka Heikkinen2010-04-131-1/+1
| | | | | * | | Make qmake possible to build with mingw using qmake.proMiikka Heikkinen2010-04-131-0/+1
| | | | * | | | Not possible to show selected text in virtual keyboardSami Merila2010-04-131-2/+13
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-131-1/+1
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | Fix typos, there is no QT_NO_SSLMarkus Goetz2010-04-131-1/+1
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-133-53/+170
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | | |/ / /
| | | | * | | QS60Style: Single Click UI support for SD 9.2 time-boxSami Merila2010-04-133-53/+170
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-14315-2652/+4612
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-144-6/+19
| |\ \ \ \ \ \
| | * | | | | | Updates to the module documentationmae2010-04-143-4/+17
| * | | | | | | Add QML documentation for validatorsAlan Alpert2010-04-141-9/+70
| |/ / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-14118-1181/+1833
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-1412-5/+109
| |\ \ \ \ \ \
| | * | | | | | Revert "qdeclarativefocusscope works fine as a parallel test"Aaron Kennedy2010-04-141-1/+0
| | * | | | | | qdeclarativefocusscope works fine as a parallel testAaron Kennedy2010-04-141-0/+1
| | * | | | | | Reduce warnings at shutdownAaron Kennedy2010-04-149-4/+73
| | * | | | | | Image with PreserveAspect enabled with either width or height defined should ...Joona Petrell2010-04-143-1/+36