summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-08-122-14/+24
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QmlInspector: Fix moc error QmlInspector: Fix compile for QT_NO_CURSOR QmlInspector: Remove unused toolbar JSDebugger: Only hit breakpoints in user code Prevent Binding from crashing when its target object is deleted. Cleanup QMLViewer properly when exiting via File->Quit. Fix crash when assigning a list property to transitions. Qml Debugging: only read properties that can be displayed in the debugger qmldump: Fix creation of objects from QDeclarativeTypes. Document state fast-forwarding. qmlplugindump: Update qmltypes file format documentation.
| * Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1158-3195/+5571
| |\
| * | Cleanup QMLViewer properly when exiting via File->Quit.Michael Brasser2011-07-261-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I7a20d46f753f5caa809e3150e44a58f4af55a506 Task-number: QTBUG-14972 Reviewed-by: Charles Yin
| * | qmldump: Fix creation of objects from QDeclarativeTypes.Christian Kamm2011-07-141-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the import statement was not necessarily set up correctly for the type we wanted to instantiate. We simply use QDeclarativeType::create now and thus can skip finding the right import. Mirrors qtcreator/f326bd067d455e979b5d83195e19581a9e2fd494 Reviewed-by: Roberto Raggi
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-teamHonglei Zhang2011-08-0410-141/+141
|\ \ \
| * | | runonphone: fix failure to terminateShane Kearns2011-08-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the serial port is always completing with no error and zero bytes read. In this case, runonphone would not shut down properly as the terminate file descriptor was never read. Reviewed-By: mread
| * | | Fix license headers in new files from coda patchShane Kearns2011-08-028-137/+137
| | | |
| * | | runonphone: command line args improperly passed to TRK after CODA patchShane Kearns2011-08-021-1/+1
| | | |
* | | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-08-044-39/+212
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Make macdeployqt more robust against usage of symbolic links.Eike Ziller2011-07-291-13/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | If binaries linked against Versions/Current *and* a specific version, the framework's binary would be copied twice, leading to duplicate symbols exceptions. Instead we now check for that condition and replicate the symbolic link. Reviewed-by: TrustMe
| * | Document support for Linguist on Mac.Eike Ziller2011-07-272-0/+118
| | | | | | | | | | | | | | | | | | | | | | | | Fixes dragging documents on Linguist dock icon, double clicking document in Finder, and the "open" terminal command. Task-number: QTBUG-20194 Reviewed-by: Oswald Buddenhagen
| * | Make mac(deploy|change)qt handle dylibs that use Qt inside an app bundle.Eike Ziller2011-07-262-18/+54
| | | | | | | | | | | | | | | | | | Needed e.g. for Qt Creator, which is a bundle of plugins. Reviewed-by: TrustMe
| * | Guard macdeployqt against @rpath and @loader_path too.Eike Ziller2011-07-261-2/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Fix typo.Eike Ziller2011-07-261-6/+6
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Merge remote-tracking branch 'qt/4.8'Honglei Zhang2011-07-2916-268/+269
|\ \ \ | |/ /
| * | fix buildRitt Konstantin2011-07-141-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | both QLock and QWSSignalHandler are imported and must not be compiled-in as this breaks the build process due to unresolved dependencies inside QWSSignalHandler QTBUG: 20236 Merge-request: 1295 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | get rid of unwanted dependencies and unused header includesRitt Konstantin2011-07-143-26/+6
| | | | | | | | | | | | | | | Merge-request: 1295 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | sync qws_dataDir() with coreapp's internal qws_dataDir()Ritt Konstantin2011-07-141-6/+19
| | | | | | | | | | | | | | | Merge-request: 1295 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
| * | Merge remote branch 'upstream/4.8'Jerome Pasion2011-07-086-35/+79
| |\ \ | | | | | | | | | | | | | | | | Conflicts: doc/src/external-resources.qdoc
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-07-052-24/+62
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Flicking behaviour of ListView/GridView SnapOnItem is inconsistent Skip flick velocity test on Mac. Try again to fix flickable velocity on Mac. Try to fix Mac CI test failure qmlplugindump: Fix dumping with -path on Mac. qmlplugindump: Improve error message for misbehaving plugin components. Flickable is too sensitive. Reduce timing dependancy in flickable test Velocities reported by Flickable in onFlickStarted can be 0 qmldump: Fix export comparison. QmlInspector: Some code cleanups QmlInspector: Some cleanup in the Color Picker tool QmlInspector: Unified mouse and keyboard event handling QmlInspector: Removed private header postfix and Qt namespace QmlInspector: Share code between QGV/SG based QML debugging qmlplugindump: For extended types, remove exports of the base object. qmlplugindump: Build debug version if possible. QDeclarativeDebug: Add code coverage information
| | | * qmlplugindump: Fix dumping with -path on Mac.Christian Kamm2011-06-291-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the current working directory was a direct parent of the qmldir path the exported modules had the path as the module URI on macs. Also changes the QtQuick export back to 1.0 to make it work with Qt 4.7.3. The version of that import statement does not actually matter as long as it's valid. Mirrors a change in Qt Creator: http://codereview.qt.nokia.com/896 Reviewed-by: Kai Koehne
| | | * qmlplugindump: Improve error message for misbehaving plugin components.Christian Kamm2011-06-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirrors 6244008dcb43dde15dea3becbbec07d941b4759c in Qt Creator/2.3. Reviewed-by: Kai Koehne
| | | * qmldump: Fix export comparison.Christian Kamm2011-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compare the full uri/name, not just the uri. Also QDeclarativeType::module was not available in 4.7.3. Mirrors http://codereview.qt.nokia.com/759 Reviewed-by: kkoehne
| | | * qmlplugindump: For extended types, remove exports of the base object.Christian Kamm2011-06-231-20/+27
| | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne
| | | * qmlplugindump: Build debug version if possible.Christian Kamm2011-06-231-0/+17
| | | | | | | | | | | | | | | | Done-with: owolff
| * | | Modified \since command behavior slightly to handle project and version.David Boddie2011-07-019-202/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (The since argument can contain a project name and version, defaulting to the qdoc project if only a version number is specified.) Refactored common code into the Generator class. Fixed \sincelist HTML generation for tables containing only one item. (cherry picked from commit 6a2f18140bbc41207eb2f5e2323b699600d89606)
| * | | Doc: Updated documentation with \since 4.8 declarations.David Boddie2011-06-301-0/+6
| | | |
* | | | Runonphone with CODA supportStephen Chong2011-07-2824-1534/+4506
| |/ / |/| | | | | | | | Reviewed-By: Shane Kearns
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-07-042-9/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Fixing winscw def file broken by recent merge runonphone: Change the upload option to allow uploading any file runonphone: Include the manufacturer name in the friendly name on OS X runonphone: Fix usb device enumeration on Mac OS X
| * | | runonphone: Change the upload option to allow uploading any fileMartin Storsjo2011-06-241-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows uploading of any file to any directory on the phone. Merge-request: 1271 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | | runonphone: Include the manufacturer name in the friendly name on OS XMartin Storsjo2011-06-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps automatic detection of devices such as N8-00, that don't include Nokia in the product name (while devices from earlier generations did include it, such as "Nokia 5800 XpressMusic"). Merge-request: 2633 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * | | runonphone: Fix usb device enumeration on Mac OS XMartin Storsjo2011-06-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in 763f3acd879648648465475aef773fe0876934a9, when merged in a315c693d0f3dd64711b8459d86b89ddc48e8c1a, broke the usb device enumeration on OS X. This commit makes it work again, but now we look for two /dev entries per device (although only one of them exists). If many usb devices are connected, this increases the risk for false matches - if that ever happens, the iteration/checking that was removed in 763f3acd879648648465475aef773fe0876934a9 could be readded within the #ifdef Q_OS_MAC, making it add only one regexp per device again. Merge-request: 2633 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-07-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: (41 commits) Make sure the declarative plugin of QtWebKit is build once. Make sure JavaScriptCore is build once. Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45 2011-05-23 Matthew Delaney <mdelaney@apple.com> Fix headers generation for QtWebKit. 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript. Fix the auto-tests of QtWebKit. 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90 Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114 Make QtWebKit actually works when linked to an application. Attempt to get Symbian building with SQLite. Make the headers test pass by including QtGui/QColor instead of QColor. Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x. Use WTF::notFound instead of -1 to check for Vector::find() errors. The autotests don't even build on Symbian, skip them for now. ...
| * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-teamQt Continuous Integration System2011-06-291-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-air-team: (39 commits) Updated WebKit to a52dbae362a295e0adfb7ee4fdc21734ae4b7b45 2011-05-23 Matthew Delaney <mdelaney@apple.com> Fix headers generation for QtWebKit. 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Skip QtWebKit as it leaks symbols and add a namespace exception for QtScript. Fix the auto-tests of QtWebKit. 2011-06-27 Joe Wild <joseph.wild@nokia.com> 2011-06-28 Alexis Menard <alexis.menard@openbossa.org> Updated WebKit to d30a30ac4faadcb8b2e282e343c921f919fbca9b Updated WebKit to 631751dee41f81af4daa7821f98b1ce8667c4d90 Updated WebKit to 0de6fbe7d7714e4d2520f84a7d7e0c5ed9a55114 Make QtWebKit actually works when linked to an application. Attempt to get Symbian building with SQLite. Make the headers test pass by including QtGui/QColor instead of QColor. Fix the in-tree build by not letting qtbase.pri add explicitlib or staticlib to CONFIG. Hack RenderBlock's continuation() and setContinuation() for RVCT 2.x. Use WTF::notFound instead of -1 to check for Vector::find() errors. The autotests don't even build on Symbian, skip them for now. Hack SystemTimeWin.cpp to build on MSVC2005. Make Float32Array and Int16Array build on RVCT 2.x. ...
| | * | | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-231-23/+40
| | |\ \ \ | | | |/ /
| | * | | Merge branch '4.8' of git://gitorious.org/qt/qt into 4.8Alexis Menard2011-06-2237-2905/+5147
| | |\ \ \
| | * | | | Fix configure after new import of WebKit.Alexis Menard2011-05-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.exe still needs to be regenerated. Reviewed by: Andreas Kling
* | | | | | Doc: Fixing typoSergio Ahumada2011-06-301-1/+1
|/ / / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-06-271-2/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5
| * | | | QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5Simo Fält2011-06-171-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced std::cout with QTextStream Reviewed-by: Eckhart Köppen
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-06-221-23/+40
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Fix QDeclarativeInspector when starting with ,block qmlplugindump: Add -v option. qmlplugindump: Fix emitted tooling version.
| * | | qmlplugindump: Add -v option.Christian Kamm2011-06-211-23/+40
| | | | | | | | | | | | | | | | Reviewed-by: Kai Koehne
| * | | qmlplugindump: Fix emitted tooling version.Christian Kamm2011-06-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes 10f16bc55b9e5535bc3353260f97a32e18d70cf1. Reviewed-by: Kai Koehne
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-1725-2628/+4868
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/righttoleft.qdoc examples/draganddrop/fridgemagnets/main.cpp examples/script/context2d/main.cpp
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-101-1/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix build on windows 7
| | * | | fix build on windows 7Oswald Buddenhagen2011-06-101-1/+0
| | | | | | | | | | | | | | | | | | | | remove pointless epocroot.pri inclusion
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-06-091-6/+16
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QDeclarativeDebug: Don't hang if started with ',block' argument QDeclarativeDebug: Fix QJSDebugService if launched with ',block' Fix docs on caching for images loaded by image providers Fixed compile of tst_qscriptextensionplugin on some Windows configurations QDeclarative: fixed clean animation lists DeclarativeObserver: Don't fade in the highlight edge Renamed declarativeobserver plugin to qmldbg_inspector QmlDebugger: adding slots to items in Live Preview QmlDebugger: parsing packets iteratively in the communication protocol qmlplugindump: Bump QtQuick.tooling version to 1.1. qmlplugindump: Dump revision property. qmlplugindump: Fix --path usage with drive letters on Windows. ListView segmentation fault when setting highlight to null DeclarativeObserver: Fixed duplicates in item selection
| | * | | qmlplugindump: Bump QtQuick.tooling version to 1.1.Christian Kamm2011-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirrors a change to qmlplugindump in qtcreator/715cee76a9e46efb7f8245004aaa8a1c47b1618d Reviewed-by: Kai Koehne
| | * | | qmlplugindump: Dump revision property.Christian Kamm2011-05-301-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mirrors a change to qmldump in qt-creator/6e3274240077fc356a37d3de735b3b2da9654d2e Reviewed-by: Roberto Raggi
| | * | | qmlplugindump: Fix --path usage with drive letters on Windows.Christian Kamm2011-05-301-5/+6
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we can't import by such a path, we instead use a "." import and set the uri of the component to the correct path. Mirrors a change to qmldump in qt-creator/0c8b4e38fab1862e3427aac7e7db68623bc7f174 Reviewed-by: Thomas Hartmann (cherry picked from commit 3904e604f453b43b2a0e45a882283e26a27eaa18)
generated by cgit v0.12 at 2024-12-29 09:40:06 (GMT)