summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-132676-3479/+321418
|\ | | | | | | | | | | 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-1342-2829/+1122
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * 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
| | |
| | * add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefsOswald Buddenhagen2010-02-122-5/+3
| | | | | | | | | | | | Reviewed-by: mariusSO
| | * use variables from the spec instead of hard-coding platform ifdefsOswald Buddenhagen2010-02-121-7/+4
| | | | | | | | | | | | Reviewed-by: mariusSO
| | * move $(DEL_FILE) 2> NUL redirection into .conf fileOswald Buddenhagen2010-02-122-15/+3
| | | | | | | | | | | | | | | | | | | | | littering generic makefile generator code with it is both plain ugly and unnecessary. Reviewed-by: mariusSO
| | * fix host platform conditionalOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | Reviewed-by: mariusSO
| | * purge msvc.net and msvc2002 makespecs. unsupported for a while now.Oswald Buddenhagen2010-02-124-359/+0
| | | | | | | | | | | | Suggested-by: mariusSO
| | * purge msvc6 suppport from qmake. qt doesn't support it for quite a while now.Oswald Buddenhagen2010-02-1213-1585/+7
| | | | | | | | | | | | Acked-by: mariusSO
| | * remove weird -tp ce matching line nobody can say anything aboutOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | Reviewed-by: mariusSO
| | * remove remainder of mac9 modeOswald Buddenhagen2010-02-125-24/+6
| | | | | | | | | | | | Reviewed-by: mariusSO
| | * remove the most blatant tmake compat pathsOswald Buddenhagen2010-02-123-12/+2
| | | | | | | | | | | | Reviewed-By: mariusSO
| | * simplifyOswald Buddenhagen2010-02-121-1/+1
| | | | | | | | | | | | | | | | | | no need to recalculate a value which we have an own variable for Reviewed-By: mariusSO
| | * 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-qml into ↵Qt Continuous Integration System2010-02-121-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-125-13/+31
| | | |\
| | | * | 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/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
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-122605-135/+319217
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | * | | Compile fix for OSX.Roberto Raggi2010-02-121-1/+2
| | | |/ | | |/|
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-124-6/+2
| | |\ \
| | | * | Fix warningsAaron Kennedy2010-02-124-6/+2
| | | | |
| | * | | Make compile. QmlMetaType::isObject() has changed to isQObject().Bea Lam2010-02-121-1/+1
| | |/ /
| | * | 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-1213-173/+136
| | | | | | | | | | | | | | | | Remove some unnecessary methods from the QmlMetaType class
| | * | Fix case sensitivity bug in previous commitJoona Petrell2010-02-122-2/+2
| | | |
| | * | Adds inputMethodHint property to TextEdit and TextInput.Joona Petrell2010-02-126-0/+47
| | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| | * | Decouple Loader from QmlGraphicsItemJoona Petrell2010-02-129-43/+231
| | | | | | | | | | | | | | | | | | | | Task-number: QT-2823 Reviewed-by: Aaron Kennedy
| | * | Make test more stable.Rohan McGovern2010-02-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qApp->processEvents() has the same effect as QTest::qWait(0) and should already `Let the animation start'. The additional events processing would let the animation progress too far on a slow machine. Timing tested by running under Valgrind.
| | * | Fixed race condition in tst_qmlgraphicswebview::multipleWindowsRohan McGovern2010-02-122-1/+5
| | | | | | | | | | | | | | | | This timer must not be started until the web view has finished loading.
| | * | 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
| | * | Fix qmlgraphicswebview:pixelCache autotest by setting defaults on htmlLeonardo Sobral Cunha2010-02-121-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Michael Brasser
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-112598-40/+318918
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | | * | Fixed compile of these recently renamed tests.Rohan McGovern2010-02-119-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Renaming the source file requires renaming the .moc file too. Unfortunately the problem is hidden when not doing a clean build.
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-112598-40/+318918
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| | | | * | Adds qml prefix to all declarative autotestsLeonardo Sobral Cunha2010-02-11215-19/+19
| | | | | |
| | | | * | Removed "running: true" for animations used as propertyvaluesourceLeonardo Sobral Cunha2010-02-1130-39/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attribution is not necessary anymore since 923710196d6d5..., Reviewed-by: Michael Brasser
| | | | * | Animations are running by default when used as property source valueLeonardo Sobral Cunha2010-02-115-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | Fix QmlEngine offlineStoragePath test.Martin Jones2010-02-111-1/+1
| | | | | |
| | | | * | Fix Image test on Windows.Martin Jones2010-02-111-4/+4
| | | | | |
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-110-0/+0
| | | | |\ \
| | | | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-111-9/+9
| | | | | |\ \
| | | | | * | | Test should use ceil() not floor() since ceil() is used for calculatingBea Lam2010-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | width in QmlGraphicsTextPrivate::setupTextLayout().
generated by cgit v0.12 at 2024-09-19 21:00:03 (GMT)