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-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)
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-06-091-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Fix compilation of qtconfig without X11
| | * | | Fix compilation of qtconfig without X11Olivier Goffart2011-06-081-2/+9
| | | | | | | | | | | | | | | | | | | | Patch-by: Christian Kamm
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-06-0822-2610/+4817
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits) Fix autotest on Windows Compile on Mac OS X Ammend last commit Implemented QAccessibleTextEdit::attributes() Changing cursor position in all boundaries code clean-up for QSystemSemaphore simplify QSharedMemoryPrivate::cleanHandle() minor improvements for QSharedMemory fix potential keyfile leaking refactoring of the QWSSharedMemory class allow the user to averride QT_QWS_TEMP_DIR in qplatformdefs.h minor typo fix minor code simplification minor code simplification avoid the QT_NO_ASCII warning remove an unused headers nano optimization don't reallocate memory if the old buffer has sufficient capacity fix potential memory leaking don't delete the lock if it was not created by this surface ...
| | * | | "fix" license headersOswald Buddenhagen2011-06-029-126/+207
| | | | | | | | | | | | | | | | | | | | our policy and even more its implementation is mildly braindead ...
| | * | | need no qlibraryinfo any moreOswald Buddenhagen2011-06-012-21/+0
| | | | | | | | | | | | | | | | | | | | we call qmake now
| | * | | remove dead variablesOswald Buddenhagen2011-06-011-17/+3
| | | | |
| | * | | optimization: avoid creating unnecessary temporariesOswald Buddenhagen2011-06-011-35/+29
| | | | | | | | | | | | | | | | | | | | | | | | | erase messages instead of building a new list of non-dropped ones. modify messages instead of replacing them with modified copies.
| | * | | add hash-based indexing to Translator for fast find()Oswald Buddenhagen2011-06-012-26/+92
| | | | |
| | * | | remove Translator::translatedMessages()Oswald Buddenhagen2011-06-013-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | it's inefficient to construct a new list. on top of that, the only user actually checks the message state again.
| | * | | remove Translator::contains()Oswald Buddenhagen2011-06-013-10/+1
| | | | | | | | | | | | | | | | | | | | it's redundant with find() now, as the latter is cheap now
| | * | | optimization: make the Translator::find() api index-basedOswald Buddenhagen2011-06-013-35/+38
| | | | |
| | * | | fix misnomer: MainWindow::closePhraseBooks() => maybeSavePhraseBooks()Oswald Buddenhagen2011-06-012-3/+3
| | | | |
| | * | | nuke Translator::release(), make saveQM() non-static insteadOswald Buddenhagen2011-06-015-14/+5
| | | | | | | | | | | | | | | | | | | | this "factory" served only to obfuscate the code
| | * | | synchronize qmake project parser with qt creatorOswald Buddenhagen2011-06-0114-2580/+4708
| | |/ / | | | | | | | | | | | | | | | | qt creator as of ddb918f. not feeling like replaying the whole history ...
| * | | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-06-061-1/+14
| |\ \ \ | | |/ / | |/| |
| | * | Update Japanese translations.Takumi ASAKI2011-06-061-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix some inconsistent translations. * Translate some missing messages. * Update Japanese phrasebook. Merge-request: 1249 Reviewed-by: ossi
| * | | Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-06-011188-20202/+21126
| |\ \ \ | | | |/ | | |/|
| * | | use a printErr() function instead of std::cerr like in lupdateOswald Buddenhagen2011-06-011-8/+12
| | | |
* | | | qdoc: Fixed code to match comments in QML files. Fixed API types.David Boddie2011-06-082-7/+6
| | | |
* | | | Added an additional check to workaround an issue on Windows.David Boddie2011-06-011-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie Original-patch-by: Friedemann Kleint
* | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-241184-20254/+20283
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qrawfont.cpp src/gui/text/qtextlayout.cpp src/gui/util/qscroller.cpp src/gui/widgets/qlineedit.cpp
| * | | Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-05-2013-221/+221
| |\ \ \
| | * | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-05-183-51/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New files after merged from qt/4.8 Reviewed-by: Trust Me
| | * | | Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-181-6/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/examples/wheel.qdoc src/gui/util/qflickgesture.cpp src/gui/util/qflickgesture_p.h src/gui/util/qscroller.cpp src/gui/util/qscroller.h src/gui/util/qscroller_p.h src/gui/util/qscrollerproperties.cpp src/gui/util/qscrollerproperties.h tests/auto/qscroller/tst_qscroller.cpp
| | * \ \ \ Merge remote-tracking branch 'qt/4.8'Jyri Tahtela2011-05-167-1/+910
| | |\ \ \ \
| | * | | | | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131180-20042/+20042
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| * | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7Rohan McGovern2011-05-171171-20027/+20056
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_iterator_unix.cpp src/corelib/io/qfsfileengine_iterator_win.cpp src/network/access/qnetworkaccessdatabackend.cpp src/xmlpatterns/expr/qevaluationcache_p.h tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/qtconfig/mainwindowbase.cpp tools/qtconfig/paletteeditoradvancedbase.cpp tools/qtconfig/paletteeditoradvancedbase.ui tools/qtconfig/previewwidgetbase.ui
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-171177-19993/+19993
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updating file with CRLF line endings for the updated header Fix a regression in QList::mid() update gitignore remove -fno-stack-protector Fix make confclean Update licenseheader text in source files
| | | * | | | Update licenseheader text in source filesJyri Tahtela2011-05-131177-19993/+19993
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-05-139-155/+184
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | doc: Fixed QTBUG-19226Martin Smith2011-05-121-2/+6
| | | | | | |
| | | * | | | doc: Fixed QTBUG-19223Martin Smith2011-05-121-1/+3
| | | | | | |
| | | * | | | doc: Remved debug code for QTBUG-18791Martin Smith2011-05-121-26/+0
| | | | | | |
| | | * | | | doc: Fixed QTBUG-18791Martin Smith2011-05-119-145/+193
| | | | | | |
| | | * | | | doc: Fixed a QML snippet referenceMartin Smith2011-05-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updated the Config class for reuse.
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-05-161-6/+6
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert all QScroller and QFlickGesture related code. Fix regression that caused waitForXXX(-1) to fail.
| | * | | | Revert all QScroller and QFlickGesture related code.Robert Griebl2011-05-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commits 0274e68767cce6440515a68d6af868725d5577a4 2770b1277744bb676e96e4ae8c89acd645ec895d 02e1f4e83dc8e3c4ab957095167b3d34c51ba3c1 fdf3be5b6b5db75833e0a7e9a90445ddd794fe4d d1f9a534da288884f443a975f428b0cfe0a7b29b 205d607c3387d074fb87f8deb77a8f515ae2e189 32d200da9cc7a4dfb3f302f22ef5718a286845c9 3e0df49f978933b1e4e6b48c695bf813ec9a2828 82bbc1c1611bde33680d22a1a3c6449e51d7b0b9 b78ffe51f9a4c4ac705e435d45fffe39864c032d fe438d7d828021d7f86301af36fe8dff2768532a df30d58de183d13c649ef7e0fbb8e2b3658e0862 fa845566b3733bc06454b71e33b1ff405ba32280 4f9a318d639c4e7e09e56751d31608fb39d472af 4810b587a65d81f8f90646efd09cadeb1276a756 7bad867382ad6c84155ffcfbb361709a8e8184ab 64ec011c6132496eb9555c1d09e7fd4ddf472837 81492e56aba5b5761500543665012a85d6835513 b668857b3749b39c3a61e0a25e750740b74df552 78a7a02b3b85435bc28eb23e9210522467171e42 Reviewed-By: Ralf Engels
* | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8David Boddie2011-05-1610-6/+912
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-05-136-1/+899
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Allow 'typeinfo <file>' lines in qmldir. qmlplugindump: Use command line options with a single dash. qmlplugindump: Allow dumping by path without URI. Move qmldump from Qt Creator to Qt.
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into ↵Kai Koehne2011-05-126-1/+899
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | master-qml-staging
generated by cgit v0.12 at 2024-12-03 22:26:03 (GMT)