summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-153-3/+34
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Assistant: Rebuild search index at most once at start-up. Prepare translations of the declarative module.
| * Assistant: Rebuild search index at most once at start-up.ck2010-02-153-3/+34
| | | | | | | | Reviewed-by: kh1
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-1370-1218/+9541
|\ \ | |/ | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * Refactor font and zoom handling, reduces clutter in central widget.kh12010-02-1210-167/+212
| | | | | | | | Reviewed-by: ck
| * Some more refactoring.kh12010-02-1212-358/+462
| | | | | | | | | | | | | | | | Move the QTextBrowser based help viewer into it's own source files and introduce a common base clase that currently only contains the statics, but more to come for common stuff. Review: ck
| * Move the QWebView based help viewer into it's own source files.kh12010-02-129-434/+560
| |
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-121-118/+112
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Help system: Handle all Clucene exceptions.
| | * Help system: Handle all Clucene exceptions.ck2010-02-121-118/+112
| | | | | | | | | | | | Reviewed-by: kh1
| * | Make compile. QmlMetaType::isObject() has changed to isQObject().Bea Lam2010-02-121-1/+1
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1151-7/+7929
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3397 commits) Update QmlChanges.txt Adds qml prefix to all declarative autotests Removed "running: true" for animations used as propertyvaluesource Animations are running by default when used as property source value Fix QmlEngine offlineStoragePath test. Fix Image test on Windows. Fix FontLoader test on Windows. Test should use ceil() not floor() since ceil() is used for calculating Fix BorderImage tests on Windows. Test should use ceil() not floor() since ceil() is used for calculating Clean up Must pass app arguments onto qExec() or else test system cannot QML Object toString should use 64-bit address on 64-bit platforms Improve stability of tst_qmlecmascript::dynamicDestruction Fix tst_qmlecmascript::callQtInvokables Fixed qmldebug* tests crashing. Fix declarative/qmldom::loadDynamicProperty autotest Fix declarative/animatedimage autotest Removed the tests/auto/declarative/visual(&examples) from .pro Add EXPECT_FAIL to js parser tests in declarative ui ...
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1051-7/+7929
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits) Expect fail. Expect fails. Attempt to clairify highlight range docs Make sure item release isn't deferred indefinately Expect fail. Missing file Exclude plugins example in test. Test Crash Fix tests Compile. Remove pathview test. Remove unneeded Fix repeater test. Revert "Remove unimplemented methods from header" Revert "Replace QList<>* support with QmlListProperty" Revert "Compile" Add expected fail and created QTBUG-8072 for qml animation auto-test Fix expected error message. Consolidate the two pathview tests and fix them all. ...
| | | * Revert "Compile"Martin Jones2010-02-101-2/+2
| | | | | | | | | | | | | | | | This reverts commit 0286ecdb8fc87b2c42d215aaabcbbffb5c508f01.
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-0951-7/+7929
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3355 commits) Get test compiling Remove unimplemented methods from header Properly insert objects into the context's object list Missed a file Compile Replace QList<>* support with QmlListProperty Remove old implicit module support. Use networkAccessManagerFactory() for worker threads too. Connect to localhost instead of QHostAddress::Any. Fixes test on Windows. Support the other validators Add empty constructor for validators. Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType Document QtObject Changed define name to reflect change in Creator. re-enable QT_USE_FAST_CONCATENATION XMLHttpRequest collection bug For local fonts, we can just addApplicationFont() rather than loading data. The virtual keyboard is now working for TextEdit and TextInput components. Fix viewport size update. Make transformOrigin Center by default ...
| | | | * CompileAaron Kennedy2010-02-091-2/+2
| | | | |
| | | | * Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-051-1/+1
| | | | |
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-0551-7/+7929
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
| | | | | * Make sure cookies are saved.Martin Jones2010-02-041-1/+4
| | | | | |
| | | | | * Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-0451-7/+7926
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | | | | | * Really run image reader in its own thread.Martin Jones2010-02-031-4/+2
| | | | | | |
| | | | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Bea Lam2010-02-0357-402/+359
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | | | * Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-02-0257-402/+359
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
| | | | | | * | | Disallow ids that start with uppercase letters and update docs andBea Lam2010-02-031-5/+5
| | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | examples accordingly. Task-number: QT-2786
| | | | | | * | Move image network access into a separate thread, with decoding.Martin Jones2010-01-292-59/+109
| | | | | | | |
| | | | | | * | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-2718-117/+424
| | | | | | |\ \
| | | | | | * | | Compile with Qt 4.6.1Aaron Kennedy2010-01-201-0/+10
| | | | | | | | |
| | | | | | * | | Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-208-12/+13
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp
| | | | | | * \ \ \ Merge branch '4.6' of ../qt into kinetic-declarativeuiAaron Kennedy2010-01-192-2/+3
| | | | | | |\ \ \ \
| | | | | | * \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Alan Alpert2010-01-191-0/+3
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | | | * | | | | Doc.Martin Jones2010-01-191-0/+1
| | | | | | | | | | | |
| | | | | | | * | | | | Allow the QML based file browser to be used in place of native.Martin Jones2010-01-191-0/+2
| | | | | | | | | | | |
| | | | | | * | | | | | Fix bad behaviour on N900Alan Alpert2010-01-191-1/+1
| | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7431 Reviewed-by: akennedy
| | | | | | * | | | | Doc fixes.Michael Brasser2010-01-152-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7322
| | | | | | * | | | | Remove debuggingAaron Kennedy2010-01-141-1/+0
| | | | | | | | | | |
| | | | | | * | | | | Add toggle orientation optionAaron Kennedy2010-01-142-0/+14
| | | | | | | | | | |
| | | | | | * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-141212-1347/+1533
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | | | * \ \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-141212-1347/+1533
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| | | | | | * | | | | | | Only force graphicssystem raster on X11Aaron Kennedy2010-01-141-1/+1
| | | | | | |/ / / / / /
| | | | | | * | | | | | Various QML browser improvementsMartin Jones2010-01-121-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Easier to press Up button - Fix highlight color - Fix keypad navigation
| | | | | | * | | | | | Always exit on play script failureAaron Kennedy2010-01-121-1/+1
| | | | | | | | | | | |
| | | | | | * | | | | | Move choice of pipelining to the point request.Warwick Allison2010-01-111-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (based on advice from Thiago)
| | | | | | * | | | | | PreferNetwork (the default) is fixed, no need to force PreferCache.Warwick Allison2010-01-081-1/+0
| | | | | | | | | | | |
| | | | | | * | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-01-0529-755/+4397
| | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | | | | | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2010-01-0529-755/+4397
| | | | | | | |\ \ \ \ \ \
| | | | | | * | | | | | | | WGZ is just a ZIP, so accept that too.Warwick Allison2010-01-051-1/+2
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | Basic WGT/WGZ support.Warwick Allison2010-01-053-6/+109
| | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-524
| | | | | | * | | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-12-1815-1635/+0
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| | | | | | | * | | | | | | Remove creatorplugin (it's moved to the creator repository)Bea Lam2009-12-1715-1635/+0
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-1712-164/+219
| | | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro
| | | | | | * | | | | | | | Make QListModelInterface API more sensible for our use case.Martin Jones2009-12-162-0/+15
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-101-1/+1
| | | | | | |\ \ \ \ \ \ \ \
generated by cgit v0.12 at 2024-11-20 18:11:13 (GMT)