summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash in QML binding optimizerAaron Kennedy2010-02-163-138/+164
| | | | Optimized bindings need to reset the mePtr too.
* Don't delete binding directlyAaron Kennedy2010-02-161-2/+4
| | | | | Bindings should be destroyed by calling their destroy() method, not by deleting them.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-166-7/+48
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-153-4/+8
| |\
| | * Fixing QDesktopServices so that file server session can be accessedAleksandar Sasha Babic2010-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from secondary thread. It is well known fact that CEikonEnv::Static() will return NULL from secondary thread. This means that accessing QDesktopServices from secondary thread will cause crash. Example for this is qmlviewer, where there is separate thread that handles .qml files. Reviewed-by: TrustMe
| | * Exposing some Validators requires Qt >= 4.7.0Alan Alpert2010-02-152-2/+6
| | | | | | | | | | | | This commit should make declarative compile against 4.6.2 again.
| * | Fix TextInput keypad navigationAlan Alpert2010-02-151-2/+4
| |/ | | | | | | | | | | | | Was accidentally ignoring key movements even when an existing selection meant that pressing right/left would do something. Task-number: QT-2944
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-153-1/+8
| |\
| * | For qmldebug* tests, make sure engine is running before the test threadBea Lam2010-02-152-1/+36
| | | | | | | | | | | | is started. Also fix some memory leaks.
* | | Ensure new WebView windows are notified correctly. Improve test.Warwick Allison2010-02-151-1/+2
| |/ |/| | | | | | | Change 282a46ab5edafa7b82e9c58658143cb979db2d85 prevents itemChange() notification. That seems wrong, but this change is a work-around.
* | Fix compile with -no-webkitWarwick Allison2010-02-153-1/+8
|/
* Fix buildWarwick Allison2010-02-153-6/+0
| | | | Remove unneeded .moc imports resulting from moved classes.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1541-522/+719
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Remove noop code Move type initialization from global static initializers to QmlEngine construction.
| * Remove noop codeAaron Kennedy2010-02-151-1/+0
| |
| * Move type initialization from global static initializers to QmlEngine ↵Warwick Allison2010-02-1440-521/+719
| | | | | | | | | | | | construction. Task-number: QT-2798
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-13338-269/+107080
|\ \ | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-131-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Refactor font and zoom handling, reduces clutter in central widget. Some more refactoring. Move the QWebView based help viewer into it's own source files. add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs use variables from the spec instead of hard-coding platform ifdefs move $(DEL_FILE) 2> NUL redirection into .conf file fix host platform conditional purge msvc.net and msvc2002 makespecs. unsupported for a while now. purge msvc6 suppport from qmake. qt doesn't support it for quite a while now. remove weird -tp ce matching line nobody can say anything about remove remainder of mac9 mode remove the most blatant tmake compat paths simplify add qt5 todo
| | * add qt5 todoOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | Reviewed-by: mariusSO
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-131-2/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Fix scrolling backwards when pathItemCount != model.count
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-124-12/+29
| | |\ \ | | | |/
| | * | Fix scrolling backwards when pathItemCount != model.countAlan Alpert2010-02-121-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixes -Scrolling backwards when model.count != 0 mod pathItemCount -A minor typo in a comment Task-number: QTBUG-6865 Reviewed-by: Martin Jones
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-131-2/+12
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled searching of IM plugins on Symbian.
| | * | Enabled searching of IM plugins on Symbian.axis2010-02-121-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It will try hbim and coefep first. - If both are missing (coefep can only be missing if compiled without S60 support), other plugins in the inputmethods plugin directory are attempted. Task: QT-2460 RevBy: Sami Merila
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-12317-109/+106597
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3410 commits) Compile fix for OSX. Make compile. QmlMetaType::isObject() has changed to isQObject(). Fix warnings Reference count shared expression data Cleanup public QmlMetaType API Fix case sensitivity bug in previous commit Adds inputMethodHint property to TextEdit and TextInput. Decouple Loader from QmlGraphicsItem Make test more stable. Fixed race condition in tst_qmlgraphicswebview::multipleWindows Explicitly pass size to standard pixmap icon loaders. Fix qmlgraphicswebview:pixelCache autotest by setting defaults on html Fixed compile of these recently renamed tests. 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. ...
| | * Fix warningsAaron Kennedy2010-02-124-6/+2
| | |
| | * Reference count shared expression dataAaron Kennedy2010-02-122-1/+7
| | | | | | | | | | | | | | | | | | QmlExpression uses data from the QmlCompiledComponent (eg. expression string data). It must therefore hold a reference to the QmlCompiledComponent to prevent the data being deleted.
| | * Cleanup public QmlMetaType APIAaron Kennedy2010-02-1212-158/+112
| | | | | | | | | | | | Remove some unnecessary methods from the QmlMetaType class
| | * Adds inputMethodHint property to TextEdit and TextInput.Joona Petrell2010-02-122-0/+3
| | | | | | | | | | | | Reviewed-by: Martin Jones
| | * Decouple Loader from QmlGraphicsItemJoona Petrell2010-02-124-38/+119
| | | | | | | | | | | | | | | Task-number: QT-2823 Reviewed-by: Aaron Kennedy
| | * Explicitly pass size to standard pixmap icon loaders.Michael Brasser2010-02-121-95/+95
| | | | | | | | | | | | | | | | | | | | | If no size is passed the pixmaps will always be loaded to determine the size, wasting memory. This change allows the pixmaps to be loaded lazily. Reviewed-by: jbache
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-11316-14/+106462
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3398 commits) Fixed compile of these recently renamed tests. 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 ...
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-11316-14/+106462
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | | | * Update QmlChanges.txtLeonardo Sobral Cunha2010-02-111-0/+2
| | | | |
| | | | * Animations are running by default when used as property source valueLeonardo Sobral Cunha2010-02-112-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you assign an animation to a property (used as source value), the animation will automatically start running, which is the most common behavior for this use case. Reviewed-by: Michael Brasser
| | | | * QML Object toString should use 64-bit address on 64-bit platformsAaron Kennedy2010-02-111-1/+1
| | | | |
| | | | * Fix tst_qmlecmascript::callQtInvokablesAaron Kennedy2010-02-111-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assert in qmlobjectscriptclass.cpp is valid when the call is running in a correctly created QML environment, but not valid for the test case which bypasses QML.
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-10316-14/+106449
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-102-9/+16
| | | | | |\
| | | | | | * Make sure item release isn't deferred indefinatelyMartin Jones2010-02-102-9/+16
| | | | | | |
| | | | | * | Attempt to clairify highlight range docsAlan Alpert2010-02-101-0/+10
| | | | | |/
| | | | | * CrashAaron Kennedy2010-02-101-0/+2
| | | | | |
| | | | | * Revert "Remove unimplemented methods from header"Martin Jones2010-02-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e712ecee850e04084643243a096befbf47e4e8b9.
| | | | | * Revert "Replace QList<>* support with QmlListProperty"Martin Jones2010-02-1019-215/+318
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d914555badcd4761864657e1e335e657b791453f.
| | | | | * A little optimization in QTextControlPrivate::setContent.Alexis Menard2010-02-091-3/+5
| | | | | |
| | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-09315-11/+106320
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | | | | | * Remove unimplemented methods from headerKai Koehne2010-02-091-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implementations got removed in d914555badcd4
| | | | | | * Properly insert objects into the context's object listAlan Alpert2010-02-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a failing autotest, where the object's context pointer was not being reset. This was because the object was not placed properly in the context's contextObjects list and so was not found and cleared when the context was destroyed.
| | | | | | * Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-0919-318/+215
| | | | | | |
| | | | | | * Remove old implicit module support.Warwick Allison2010-02-092-14/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, it was allowed to use type qualification to refer to types defined in subdirectories - indeed, this was the only form of modularity. This is no longer desirable since we have good import features. Task-number: QTBUG-7721
| | | | | | * Use networkAccessManagerFactory() for worker threads too.Martin Jones2010-02-092-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2850
generated by cgit v0.12 at 2025-01-25 16:32:33 (GMT)