summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-305-4/+8
|\
| * Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-293-3/+3
| * Register QtQuick 1.0 module.Aaron Kennedy2010-09-291-0/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-281-1/+4
| |\
| | * QmlViewer: Fix typo in commentKai Koehne2010-09-281-1/+1
| | * QmlViewer: Fix assert on exit (Windows)Kai Koehne2010-09-281-0/+3
* | | Don't use translations for console tools under windowsVictor Ostashevsky2010-09-285-1/+11
|/ /
* | Merge commit 'oslo-staging-1/4.7' into week39Morten Engvoldsen2010-09-271-7/+41
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-09-241-7/+41
| |\
| | * Small fixes to Browser.qmlJoona Petrell2010-09-241-7/+41
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-248-11/+26
|\ \ \ | |/ /
| * | Assistant: Don't register internal doc when using custom collection.Christian Kandeler2010-09-234-3/+16
| * | Assistant: Move comment to the right place.Christian Kandeler2010-09-231-5/+7
| |/
| * Designer: Minor BT issue: '-' button in Signal/Slot editor not updated.Friedemann Kleint2010-09-231-1/+1
| * build configure.exe directly in source dirOswald Buddenhagen2010-09-231-1/+1
| * fix build key generation for realOswald Buddenhagen2010-09-231-1/+1
* | Added a condition to skip obsolete functions during the threadness check.Jerome Pasion2010-09-241-16/+19
* | Doc: maintainance - fixing grammar and spellingMorten Engvoldsen2010-09-231-2/+2
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-221-3/+13
|\
| * Enable building Qt/Webkit with debug symbolsAnders Bakken2010-09-201-3/+13
* | Bump version to 4.7.1.Jason McDonald2010-09-2113-41/+41
|/
* Make qml debugging work with command line argumentsLasse Holmstedt2010-09-171-0/+11
* Merge branch '4.7' into fridayMorten Engvoldsen2010-09-171-5/+3
|\
| * 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
* | | Doc: removing linebreakMorten Engvoldsen2010-09-161-1/+0
* | | Doc: correcting html templateMorten Engvoldsen2010-09-161-12/+3
* | | Merge branch '13092010doc' into doc-4.7Morten Engvoldsen2010-09-161-4/+4
|\ \ \
| * | | Doc: Removing google analytics from offline docsMorten Engvoldsen2010-09-162-15/+5
| * | | Doc: correcting html template - validatingMorten Engvoldsen2010-09-161-1/+1
| * | | Doc: correcting html templateMorten Engvoldsen2010-09-161-28/+22
| |/ /
* | | Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299...Morten Engvoldsen2010-09-151-28/+22
|/ /
* | 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