summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-161-5/+3
|\
| * Compile with QT_NO_GESTURES.Yann Bodson2010-09-151-0/+2
| * Give file and line error information for errors in dummydata.Michael Brasser2010-09-151-5/+1
* | git Merge branch '4.7-upstream' into 4.7-docJesper Thomschutz2010-09-1510-14/+34
|\ \ | |/
| * build fix for configure.exeJoerg Bornemann2010-09-141-0/+1
| * I18n: Fix some lupdate warnings.Friedemann Kleint2010-09-145-8/+10
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-144-6/+23
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-104-6/+23
| | |\
| | | * fetch next token after class definition openingOswald Buddenhagen2010-09-101-0/+2
| | | * delay next token fetching when opening namespaceOswald Buddenhagen2010-09-101-1/+1
| | | * don't let operator overloads confuse usOswald Buddenhagen2010-09-101-0/+15
| | | * don't try to show source when no locations are givenOswald Buddenhagen2010-09-102-4/+4
| | | * Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299...Morten Engvoldsen2010-09-101-1/+1
* | | | qdoc: Fixed an html formatting error in the QML property list.Martin Smith2010-09-151-21/+1
* | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-131-0/+1
|\ \ \ \ | |/ / /
| * | | Fix compile error for runonphone on linux/gcc4.4.3Adenilson Cavalcanti da Silva2010-09-131-0/+1
| |/ /
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-1014-0/+1337
|\ \ \ | |/ /
| * | Fixed compiler warnings in meego graphics system helper.Samuel Rødal2010-09-103-13/+13
| * | Added meego graphics system helper to features/qt.prf and syncqt.Samuel Rødal2010-09-101-2/+1
| * | Use QFactoryLoader to ensure we get the correct graphics system plugin.Samuel Rødal2010-09-103-18/+35
| * | Updated license headers for meego graphics system helper.Samuel Rødal2010-09-1012-84/+408
| * | Fixed compilation and API of meego graphics system helper.Samuel Rødal2010-09-1014-228/+224
| * | Renamed meego graphics system helper files.Samuel Rødal2010-09-1013-0/+0
| * | Imported meego graphics system helper sources.Samuel Rødal2010-09-1013-0/+1001
| |/
* | Doc: Excluded the libconninet library from the documentation.David Boddie2010-09-084-6/+10
* | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-071-1/+0
|\ \ | |/
| * Tools (uic/rcc): Improve warning messages.Friedemann Kleint2010-09-071-1/+0
* | Merge branch '4.7-oslo1' into 4.7-docA-Team2010-09-0722-125/+204
|\ \ | |/
| * explicitly remove qt_webkit_version.pri when building with -no-webkitOswald Buddenhagen2010-09-071-2/+2
| * Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c ...Morten Engvoldsen2010-09-071-1/+1
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-09-076-19/+74
| |\
| | * Pause orientation sensors in Qml Viewer when the application window is not ac...Joona Petrell2010-09-075-17/+73
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-064-4/+21
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-061-2/+1
| | |\ \
| | | * | Fix recording of QML visual tests when using a QGLWidget viewport.Michael Brasser2010-09-061-2/+1
| * | | | Doc: updating the qdocconf files and the stylesheetMorten Engvoldsen2010-09-0712-99/+116
| | |_|/ | |/| |
| * | | search translator commentsOswald Buddenhagen2010-09-061-0/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-063-4/+19
| |\ \ \ | | |/ / | |/| |
| | * | Install translators earlier in assistantVictor Ostashevsky2010-09-061-2/+1
| | * | Symbian: Disable IPv6 for nowMarkus Goetz2010-09-031-0/+4
| | * | Doc: Fixing links on index page and corecting HTML in the template.Morten Engvoldsen2010-09-031-1/+1
| * | | Designer: Fix action editor scrolling.Friedemann Kleint2010-09-061-2/+4
| | |/ | |/|
* | | Doc: Added dual documentation license information to the HTML templates.David Boddie2010-09-063-0/+27
* | | Merge commit 'staging-1/4.7' into doc-4.7Morten Engvoldsen2010-09-0337-458/+590
|\ \ \ | | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-021-1/+13
| |\ \ | | |/ | |/|
| | * Add option to enable -MP compile option for MSVCMarius Storm-Olsen2010-09-021-1/+13
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-011-1/+158
| |\ \ | | |/ | |/|
| | * The declarative parser should only save comment text (and not /*,*/,//)Michael Brasser2010-09-011-3/+1
| | * Support for qsTrId and meta-data in comments for QML.Michael Brasser2010-09-011-1/+160
| * | QString usage cleanupsOswald Buddenhagen2010-09-013-17/+17