summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1444-169/+610
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (71 commits) Add QML documentation for validators Updates to the module documentation Fix minor typo in docs Revert "qdeclarativefocusscope works fine as a parallel test" qdeclarativefocusscope works fine as a parallel test Reduce warnings at shutdown Image with PreserveAspect enabled with either width or height defined should implicitly update the undefined axis to follow the aspect ratio Fix GridView.onRemove animation in photoviewer. Reduce warnings at shutdown Fix QT_NO_DESKTOPSERVICES Compiled bindings should not print warnings where normal bindings don't Update references links Move example code into separate files to make sure they compile Include qvariant.h as a convenience as context properties Merged 'orientation' into 'runtime' context property in qmlruntime Add 'runtime' property to the rootContext of DeclarativeViewer Temporarily disable tests that require compilation Fix qdeclarativedom test Further improve failure output Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystem ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-143-6/+12
| |\
| | * Updates to the module documentationmae2010-04-142-4/+10
| | |
| * | Add QML documentation for validatorsAlan Alpert2010-04-141-9/+70
| |/ | | | | | | | | | | | | Note that regExp doesn't have a type, and so it is 'documented' as string. Task-number: QTBUG-9412
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-04-1493-1068/+1631
| |\ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
| * | Reduce warnings at shutdownAaron Kennedy2010-04-146-4/+40
| | | | | | | | | | | | | | | | | | QTBUG-9799 Reviewed-by: Alexis Menard
| * | Image with PreserveAspect enabled with either width or height defined should ↵Joona Petrell2010-04-141-0/+6
| | | | | | | | | | | | | | | | | | | | | implicitly update the undefined axis to follow the aspect ratio Task-number: Reviewed-by: Martin Jones
| * | Reduce warnings at shutdownAaron Kennedy2010-04-145-9/+10
| | | | | | | | | | | | QTBUG-9799
| * | Fix QT_NO_DESKTOPSERVICESTasuku Suzuki2010-04-141-2/+8
| | | | | | | | | | | | | | | Merge-request: 2359 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alexis Menard2010-04-149-9/+20
| |\ \
| | * | Compiled bindings should not print warnings where normal bindings don'tAaron Kennedy2010-04-141-3/+1
| | | | | | | | | | | | | | | | QTBUG-9813
| | * | Include qvariant.h as a convenience as context propertiesBea Lam2010-04-141-0/+1
| | | | | | | | | | | | | | | | are commonly set and accessed
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1416-80/+365
| | |\ \
| | | * | Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-145-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| | * | | Doc: more mention of using QUrl::fromLocalFile() for URLs on local filesystemMartin Jones2010-04-142-1/+13
| | | | |
| * | | | Merge branch '4.7' into reviews/2361Alexis Menard2010-04-143953-159806/+328683
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.h
| | * | | Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-1411-75/+360
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit add a extension object to bring the anchors property for a QGraphicsWidget. The actual implement uses a separate object for storing the anchor pointer. In the future it would be nice if the extension object is the anchor itself. Also there are two connects extra for QGraphicsWidget one can perhaps disappear with a later commit. Only baseline case is not supported because QGraphicsWidget don't have any concept of baseline. Reviewed-by:akennedy
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-141-1/+1
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-142-6/+6
| | | |\ \
| | | * | | Don't warn on signals emitted after the context has been destroyedAaron Kennedy2010-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9792
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-142-6/+6
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Doc fix.Michael Brasser2010-04-142-6/+6
| | | |/ /
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-145-6/+16
| | |\ \ \ | | | |/ /
| | | * | emit onMovementStarted/Ended/Changed on wheel eventsMartin Jones2010-04-141-0/+4
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9804
| | | * | Make it clear that Qt.labs modules may not remain compatible.Martin Jones2010-04-142-0/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9807
| | | * | Complete item creation after its initial properties have been initialized.Martin Jones2010-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9800
| | | * | Don't crash when columns == 0Martin Jones2010-04-141-4/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9805
| | * | | Give better error messages on plugin load failures.Warwick Allison2010-04-142-15/+31
| | |/ / | | | | | | | | | | | | Fixes reverted commit e0dcdbd2984299665b9b784b201289219b9978d3.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-133742-152158/+319814
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-138-20/+21
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits) Remove warning on ASCII cast Fix compilation on Solaris, AIX and HP-UX. Speed up borderimage test. Exclude webview examples when compiled without webview Fix test Use SRCDIR to make examples test work with shadow builds. Example fixes Improve efficiency of model dataChanged. Optimize some autotests Fix test (run with -qws on QWS). Stabilize behaviors test. Struct -> class because class is better. Move effect property where it should be. Tweak tests to run in parallel Network-related test fails on the rare occasion Fix code style in examples Make demo code more consistent with example code in terms of variable Fix score from previous change Doc improvements Fix example code style ...
| | | | * | Remove warning on ASCII castThiago Macieira2010-04-131-1/+1
| | | | | |
| | | | * | Fix compilation on Solaris, AIX and HP-UX.Thiago Macieira2010-04-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no bzero function in POSIX. It's a 4.3BSD function, legacy in POSIX.2001 and removed in POSIX.2008. And good compilers will inline the function anyway by a builtin. It's one of the most basic algorithms. Reviewed-by: Trust Me
| | * | | | Ensure view position is correct for highlight range modes that have a static ↵Martin Jones2010-04-132-6/+2
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | highlight Task-number: QTBUG-9791
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-1326-59/+205
| | |\ \ \
| | | * | | Struct -> class because class is better.Alexis Menard2010-04-133-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well i have no idea on what to write on that commit message. Reviewed-by:akennedy
| | | * | | Move effect property where it should be.Alexis Menard2010-04-132-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:leo
| | | * | | Doc fixesBea Lam2010-04-131-4/+4
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1320-51/+192
| | | |\ \ \
| | | * | | | Fix and test remote root component with qmldir-specified content.Warwick Allison2010-04-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ed43975f6733265b8b91b00a9a212076d896ef9 was not correct fix (just invalidated the test)
| | * | | | | Improve efficiency of model dataChanged.Martin Jones2010-04-131-7/+8
| | |/ / / /
| * | | | | Fix QT_NO_GRAPHICSEFFECTTasuku Suzuki2010-04-133-5/+11
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-149-66/+235
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Phonon MMF: fixed typo in trace statement Update to def files for 4.7.0-beta1 Fixed installer_sis target for 4.7
| * | | | | Phonon MMF: fixed typo in trace statementGareth Stockwell2010-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This builds under RVCT 2.2 (although obviously the debug output will contain garbage), but causes a compiler error with RVCT 4. Reviewed-by: trustme
| * | | | | Update to def files for 4.7.0-beta1Shane Kearns2010-04-148-65/+234
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Frozen against qt-releases/4.7.0-beta1 commit 4061d0ff3e8ed72ecb83ef1026492511a0afb9fa Task-number: QTBUG-9892 Reviewed-by: Trust Me
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1481-1055/+1507
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits) Revert "Removed double setting of _WIN32_WINNT" Revert "removed a few warnings on wince builds" removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER ...
| * | | | | Revert "Removed double setting of _WIN32_WINNT"Olivier Goffart2010-04-133-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a165d1cfbb15ced6079a0d752fbdb37a478ff46f. Was causing an error: (msvc2005) qthread_win.cpp(369) : error C3861: 'SwitchToThread': identifier not found
| * | | | | Revert "removed a few warnings on wince builds"Paul Olav Tvete2010-04-132-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6b2cf497268037a5c127affeef3e6efd055164ec.
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-04-1385-1084/+1519
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (53 commits) removed a few warnings on wince builds Removed double setting of _WIN32_WINNT QTreeView: remove dead code. doc: Clarify effect of QFont::NoFontMerging Revert "Implement heightForWidth support for QTabWidget and QStackedLayout." build fix for S60 Improve handling of QAction in soft key manager Remove useless assert qdrawhelper: fix optim in 2245641ba QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage accelerate QWindowsPipeWriter for bigger chunks of data Fix antialiasing with transformed text in OpenGL2 paint engine Fix flattening of largely scaled, thin, dashed beziers. Increased the precision used to flatten beziers Fix QT_NO_MOVIE Fix compile error with QT_NO_ACTION in QtGui Fix QT_NO_COMPLETER Fix QT_NO_FSCOMPLETER Fix QT_NO_FILESYSTEMMODEL Build fix ...
| | * | | | | removed a few warnings on wince buildsThierry Bastian2010-04-132-5/+5
| | | | | | |
| | * | | | | Removed double setting of _WIN32_WINNTThierry Bastian2010-04-133-25/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Derived from the comments in merge request #2175
generated by cgit v0.12 at 2025-01-30 07:49:39 (GMT)