summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-1715-74/+86
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-166-36/+48
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enabled commit 2b60b542a for all platforms. Fixed missing repaints on S60 3.1. Build break fix for QS60Style. QS60Style: Branch indicator in tree view is misplaced Compilation error fix: missing comma in enum list in QS60Style Scroll bar handle/groove ends are squeezed (in nHD resolution) QS60Style draws drop area as a black rect Remove scrollbar context menu from QS60Style Change a name of a variable to be more descriptive
| | * Merge remote branch 'qt/master' into s60-masterQt Continuous Integration System2010-02-162-3/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-1677-258/+611
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | | * | Fixed missing repaints on S60 3.1.axis2010-02-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug happened when a paint event came in from Symbian, but the painted area was bigger than the exposed rect being passed in by Symbian. In these cases we would lose updates to the area outside. Fixed by calling Draw() once more if we detect that we painted a larger area to the backing store. It is still a mystery why this worked on 5.0 though... :-P AutoTest: QWidget passed RevBy: Jason Barron Task: QTBUG-8200
| | | * | Build break fix for QS60Style.Sami Merila2010-02-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Very recent change for QS60Style breaks compilation of the style for 3.1. This is due to that style refers to a skin item ID that is not existing on 3.1 environment. Fixed by referring to the skin ID with its internal values. Task-number: QTBUG-8193 Reviewed-by: TrustMe
| | | * | QS60Style: Branch indicator in tree view is misplacedSami Merila2010-02-151-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-7258 make itemview margins larger. This broke the treeviews visually, as indicators are not shown in correct places. Now, indocators are placed correctly for treeviews as well. Task-number: QTBUG-7995 Reviewed-by: Alessandro Portale
| | | * | Compilation error fix: missing comma in enum list in QS60StyleSami Merila2010-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for QTBUG-8193 introduced a new enum value into s60style. Unfortunately, the comma after the value didn't make it into the fix itself. Adding the comma to allow compilation of style. Task-number: QTBUG-8193 Reviewed-by: TrustMe
| | | * | Scroll bar handle/groove ends are squeezed (in nHD resolution)Sami Merila2010-02-151-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style uses non-square area for scrollbar end graphics areas. It then tries to scale the areas to make them look like native graphics (and keeps the width-height ratio), thus squeezing them. Change style so that scrollbar end areas are squares, just like in native graphics they are. Task-number: QTBUG-7996 Reviewed-by: Alessandro Portale
| | | * | QS60Style draws drop area as a black rectSami Merila2010-02-153-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Drag-n-Dropping elements in itemviews QS60Style draws drop area as a black rect. Change this so that native graphics are used instead. This change only affects touch-devices as non-touch 3.x devices do not have the native graphics defined. In 3.x non-touch devices, style still uses QCommonStyle to draw the DropArea. Task-number: QTBUG-8193 Reviewed-by: Alessandro Portale
| | | * | Remove scrollbar context menu from QS60StyleSami Merila2010-02-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently style does not forbid scrollbar context menu, so by default long pressing over the scrollbar widget shows the context menu. This is not according to 'S60-style', so from now on the stylehint SH_ScrollBar_ContextMenu returns false. Task-number: QTBUG-8194 Reviewed-by: Alessandro Portale
| | | * | Change a name of a variable to be more descriptiveSami Merila2010-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently when calculating a button content size, QS60Style has a variable called buttonWidth, which actually is the width of the content, not the button itself. Change this to buttonContentWidth. Reviewed-by: TrustMe
| | * | | Enabled commit 2b60b542a for all platforms.axis2010-02-162-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Task: QTBUG-5892 RevBy: Trust me
| * | | | doc: A QPlainTextEdit is never a QTextBrowserThorbjørn Lindeijer2010-02-161-1/+1
| | | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-158-37/+37
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Prepare translations of the declarative module.Friedemann Kleint2010-02-158-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr().
* | | | | Disable NLA plugin, build generic on win32 and mac.Aaron McCarthy2010-02-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NLA plugin locks up on exit for some programs, though not all. Disable for now until cause is found. Always build generic plugin on win32 and mac.
* | | | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
| | | | | | | | | | | | | | | | | | | | manager may be 0.
* | | | | Remove debug output.Aaron McCarthy2010-02-161-4/+4
| | | | |
* | | | | Don't block forever if no bearer plugins are loaded.Aaron McCarthy2010-02-161-0/+5
| | | | |
* | | | | Always build generic plugin when building NetworkManager plugin.Aaron McCarthy2010-02-161-1/+3
| | | | |
* | | | | Add QT_MODULE headers.Aaron McCarthy2010-02-153-0/+6
| | | | |
* | | | | Change docs: "phone" -> "device".Aaron McCarthy2010-02-151-1/+1
| | | | |
* | | | | Remove unused code.Aaron McCarthy2010-02-152-59/+0
| | | | |
* | | | | Simplify.Aaron McCarthy2010-02-151-2/+1
| | | | |
* | | | | Optimise iterations over QHash.Aaron McCarthy2010-02-153-34/+41
| | | | |
* | | | | Use snippets.Aaron McCarthy2010-02-151-8/+1
| | | | |
* | | | | Reorder members to remove hole.Aaron McCarthy2010-02-151-4/+4
| | | | |
* | | | | Expand documentation for QNAM::setConfiguration() and friends.Aaron McCarthy2010-02-151-4/+29
| | | | |
* | | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-14340-163/+106772
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * | | | 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
| | | | | | |
generated by cgit v0.12 at 2024-10-25 07:35:23 (GMT)