summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-16144-2312/+1740
|\
| * Correctly support translation in QDeclarativePixmapCacheWarwick Allison2010-04-162-5/+7
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-16102-722/+1366
| |\
| | * Correctly support translation in QDeclarativeCompilerAaron Kennedy2010-04-152-8/+2
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-15144-2302/+1724
| | |\ | |/ / |/| |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-15144-2302/+1724
| | |\
| | | * Small calculator fix.Yann Bodson2010-04-152-10/+10
| | | * Improve declarative calculator example.Yann Bodson2010-04-1513-227/+238
| | | * Update examples autotest to use the runtime directlyAaron Kennedy2010-04-154-96/+42
| | | * Support valuetypes as method return valuesAaron Kennedy2010-04-159-41/+133
| | | * Compile without Qt3 support.Yann Bodson2010-04-151-1/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-151-0/+20
| | | |\
| | | | * DocAaron Kennedy2010-04-151-0/+20
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1518-104/+178
| | | |\ \ | | | | |/
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1556-1467/+327
| | | | |\
| | | | * | Add Component.onDestruction attached propertyAaron Kennedy2010-04-1517-99/+171
| | | | * | CommentsAaron Kennedy2010-04-151-1/+3
| | | | * | Remove unused parameterAaron Kennedy2010-04-153-4/+4
| | | * | | Simplify dynamic resource loading to avoid cluttering Text API.Warwick Allison2010-04-153-13/+10
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1524-1436/+130
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | * | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-1511-44/+101
* | | | | | 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
generated by cgit v0.12 at 2024-11-27 09:07:30 (GMT)