| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-08-12 | 2 | -14/+24 |
|\ |
|
| * | Merge branch 'master' of ../qt-qml-staging | Michael Brasser | 2011-08-11 | 58 | -3195/+5571 |
| |\ |
|
| * | | Cleanup QMLViewer properly when exiting via File->Quit. | Michael Brasser | 2011-07-26 | 1 | -0/+1 |
|
|
| * | | qmldump: Fix creation of objects from QDeclarativeTypes. | Christian Kamm | 2011-07-14 | 1 | -14/+23 |
|
|
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-team | Honglei Zhang | 2011-08-04 | 10 | -141/+141 |
|\ \ \ |
|
| * | | | runonphone: fix failure to terminate | Shane Kearns | 2011-08-02 | 1 | -3/+3 |
|
|
| * | | | Fix license headers in new files from coda patch | Shane Kearns | 2011-08-02 | 8 | -137/+137 |
|
|
| * | | | runonphone: command line args improperly passed to TRK after CODA patch | Shane Kearns | 2011-08-02 | 1 | -1/+1 |
|
|
* | | | | Merge remote-tracking branch 'qt/4.8' | Honglei Zhang | 2011-08-04 | 4 | -39/+212 |
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| * | | Make macdeployqt more robust against usage of symbolic links. | Eike Ziller | 2011-07-29 | 1 | -13/+32 |
|
|
| * | | Document support for Linguist on Mac. | Eike Ziller | 2011-07-27 | 2 | -0/+118 |
|
|
| * | | Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle. | Eike Ziller | 2011-07-26 | 2 | -18/+54 |
|
|
| * | | Guard macdeployqt against @rpath and @loader_path too. | Eike Ziller | 2011-07-26 | 1 | -2/+2 |
|
|
| * | | Fix typo. | Eike Ziller | 2011-07-26 | 1 | -6/+6 |
|
|
* | | | Merge remote-tracking branch 'qt/4.8' | Honglei Zhang | 2011-07-29 | 16 | -268/+269 |
|\ \ \
| |/ / |
|
| * | | fix build | Ritt Konstantin | 2011-07-14 | 1 | -10/+2 |
|
|
| * | | get rid of unwanted dependencies and unused header includes | Ritt Konstantin | 2011-07-14 | 3 | -26/+6 |
|
|
| * | | sync qws_dataDir() with coreapp's internal qws_dataDir() | Ritt Konstantin | 2011-07-14 | 1 | -6/+19 |
|
|
| * | | Merge remote branch 'upstream/4.8' | Jerome Pasion | 2011-07-08 | 6 | -35/+79 |
| |\ \ |
|
| | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-07-05 | 2 | -24/+62 |
| | |\ \
| | | |/ |
|
| | | * | qmlplugindump: Fix dumping with -path on Mac. | Christian Kamm | 2011-06-29 | 1 | -2/+10 |
|
|
| | | * | qmlplugindump: Improve error message for misbehaving plugin components. | Christian Kamm | 2011-06-29 | 1 | -2/+8 |
|
|
| | | * | qmldump: Fix export comparison. | Christian Kamm | 2011-06-27 | 1 | -1/+1 |
|
|
| | | * | qmlplugindump: For extended types, remove exports of the base object. | Christian Kamm | 2011-06-23 | 1 | -20/+27 |
|
|
| | | * | qmlplugindump: Build debug version if possible. | Christian Kamm | 2011-06-23 | 1 | -0/+17 |
|
|
| * | | | Modified \since command behavior slightly to handle project and version. | David Boddie | 2011-07-01 | 9 | -202/+174 |
|
|
| * | | | Doc: Updated documentation with \since 4.8 declarations. | David Boddie | 2011-06-30 | 1 | -0/+6 |
|
|
* | | | | Runonphone with CODA support | Stephen Chong | 2011-07-28 | 24 | -1534/+4506 |
| |/ /
|/| | |
|
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-07-04 | 2 | -9/+15 |
|\ \ \ |
|
| * | | | runonphone: Change the upload option to allow uploading any file | Martin Storsjo | 2011-06-24 | 1 | -7/+7 |
|
|
| * | | | runonphone: Include the manufacturer name in the friendly name on OS X | Martin Storsjo | 2011-06-24 | 1 | -1/+2 |
|
|
| * | | | runonphone: Fix usb device enumeration on Mac OS X | Martin Storsjo | 2011-06-24 | 1 | -1/+6 |
|
|
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-07-02 | 1 | -1/+1 |
|\ \ \ \ |
|
| * \ \ \ | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team | Qt Continuous Integration System | 2011-06-29 | 1 | -1/+1 |
| |\ \ \ \
| | |_|/ /
| |/| | | |
|
| | * | | | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8 | Alexis Menard | 2011-06-23 | 1 | -23/+40 |
| | |\ \ \
| | | |/ / |
|
| | * | | | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8 | Alexis Menard | 2011-06-22 | 37 | -2905/+5147 |
| | |\ \ \ |
|
| | * | | | | Fix configure after new import of WebKit. | Alexis Menard | 2011-05-31 | 1 | -1/+1 |
|
|
* | | | | | | Doc: Fixing typo | Sergio Ahumada | 2011-06-30 | 1 | -1/+1 |
|/ / / / / |
|
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas... | Qt Continuous Integration System | 2011-06-27 | 1 | -2/+4 |
|\ \ \ \ \
| |_|_|/ /
|/| | | | |
|
| * | | | | QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5 | Simo Fält | 2011-06-17 | 1 | -2/+4 |
|
|
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-22 | 1 | -23/+40 |
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| | |
|
| * | | | qmlplugindump: Add -v option. | Christian Kamm | 2011-06-21 | 1 | -23/+40 |
|
|
| * | | | qmlplugindump: Fix emitted tooling version. | Christian Kamm | 2011-06-21 | 1 | -2/+2 |
|
|
* | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 25 | -2628/+4868 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-06-10 | 1 | -1/+0 |
| |\ \ \ |
|
| | * | | | fix build on windows 7 | Oswald Buddenhagen | 2011-06-10 | 1 | -1/+0 |
|
|
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-06-09 | 1 | -6/+16 |
| |\ \ \ \
| | | |/ /
| | |/| | |
|
| | * | | | qmlplugindump: Bump QtQuick.tooling version to 1.1. | Christian Kamm | 2011-05-30 | 1 | -1/+1 |
|
|
| | * | | | qmlplugindump: Dump revision property. | Christian Kamm | 2011-05-30 | 1 | -0/+9 |
|
|
| | * | | | qmlplugindump: Fix --path usage with drive letters on Windows. | Christian Kamm | 2011-05-30 | 1 | -5/+6 |
| | | |/
| | |/| |
|