summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* qmake vc[x]proj generators: support /MAP option without file nameJoerg Bornemann2010-08-242-2/+4
* qmake vcxproj generator: fix bug when using CharacterSet=1 in .pro fileJoerg Bornemann2010-08-241-1/+0
* Fix race condition on bearer management initialisation.Aaron McCarthy2010-08-242-5/+17
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2432-89/+1091
|\
| * fix build after first webkit self-injection attemptOswald Buddenhagen2010-08-234-8/+9
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2332-89/+1090
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2332-89/+1090
| | |\
| | | * Fixed touch event delivery in QGraphicsView.Denis Dzyubenko2010-08-232-7/+61
| | | * let WebKit inject itself into the qt configurationOswald Buddenhagen2010-08-238-10/+16
| | | * add indirect input/output specification capability to QMAKE_SUBSTITUTESOswald Buddenhagen2010-08-234-8/+38
| | | * Add test that exercises lupdate warnings for QtScriptKent Hansen2010-08-234-0/+118
| | | * Make qsTrId() / QT_TRID_NOOP() accessible from QtScriptKent Hansen2010-08-236-0/+133
| | | * Make lupdate's QtScript frontend recognize qsTrId() / QT_TRID_NOOP()Kent Hansen2010-08-234-0/+75
| | | * Add support for comments and meta-data in the lupdate QtScript frontendKent Hansen2010-08-235-22/+565
| | | * Streamline lupdate's QtScript frontend's error messagingKent Hansen2010-08-232-44/+78
| | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-08-231-1/+1
| | | |\
| | | * | Doc: linking up orphant filesMorten Engvoldsen2010-08-232-0/+5
| | | * | Doc: Updating menu linksMorten Engvoldsen2010-08-231-4/+7
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-245-51/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix PathView when setting an empty model that is later filled.Michael Brasser2010-08-243-2/+30
| * | | | QDeclarativeVisualItemModel code cleanup.Michael Brasser2010-08-242-49/+1
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-232-7/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Doc: QtConcurrent::run. Make sure the example actually compilesOlivier Goffart2010-08-232-7/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-08-232-2/+7
|\ \ \ \ | |/ / / |/| | |
| * | | On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible.Jani Hautakangas2010-08-231-0/+5
| * | | QWidget metadata has not been set up yet in QWidgetPrivate::init.Jani Hautakangas2010-08-231-2/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-231-4/+3
|\ \ \ \
| * | | | Doc: update the documentation of NOTIFY signal to reflect realityOlivier Goffart2010-08-231-4/+3
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-231-3/+5
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-231-3/+5
| |\ \ \ |/ / / / | | | _
| * | Doc: changing template menus to better reflect links from the index page.Morten Engvoldsen2010-08-221-3/+5
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-231-1/+1
|\ \ \ | |_|/ |/| |
| * | Move link for Declarative UI Runtime to Using QML with C++ sectionBea Lam2010-08-231-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2218-17/+62
|\ \ \ | |/ / |/| / | |/
| * Doc: Adding pages to the overviews and updating the index page.Morten Engvoldsen2010-08-223-8/+17
| * Doc: Updating pages and linking them to the overviews.Morten Engvoldsen2010-08-2215-9/+45
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-211-5/+18
|\ \ | |/
| * bindTexture: Replace texture if painting is active on pixmap/imageAndreas Kling2010-08-211-5/+18
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-08-202-5/+3
|\
| * QDeclarativeDebug: stream all the context, including the internals ones.Olivier Goffart2010-08-202-5/+3
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2049-12219/+14008
|\ \
| * | qmake vcxproj generator: fix usage of /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-1/+1
| * | qmake: fix vcxproj generator when using /Fd in QMAKE_CXXFLAGSJoerg Bornemann2010-08-201-0/+1
| * | Revised fix for pixmap loadingJens Bache-Wiig2010-08-202-0/+7
| * | Assistant: Clean-up - fix spelling mistakes.Christian Kandeler2010-08-201-1/+1
| * | Assistant: Clean-up: Use const references in foreach loops.Christian Kandeler2010-08-202-3/+3
| * | Assistant: Clean-up: Mark constructors as explicit.Christian Kandeler2010-08-2013-16/+19
| * | Assistant: Clean-up - add newlines to end of files.Christian Kandeler2010-08-202-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-2029-12196/+13974
| |\ \
| | * | Doc: Changes to the index page and second level pages linking to the index page.Morten Engvoldsen2010-08-204-7/+11