summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'staging-1/4.7' into fridayMorten Engvoldsen2010-09-172-7/+9
|\
| * Make dialcontrol.qml usable on highres capacitive screenAlessandro Portale2010-09-161-0/+1
| |
| * Make easing.qml usable on highres capacitive screenAlessandro Portale2010-09-161-7/+8
| |
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-09-16155-147/+231
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-16150-147/+231
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed regression in QPixmap::size() for null pixmaps. Make test less sensitive to platform specifics Doc: Further QML improvements. Doc: Minor improvements to QML-related documentation. The test livelock of QTimer is now expected to work Make sure mapSelectionFromSource does not return a selection with invalid ranges. QEventDispatcherUnix: do not process too many timer if other events need to be processed first Doc: Continued work on the QML documentation. Doc: More work on the QML documentation. Doc: More work on the declarative API documentation. Doc: Some editing and tidying up. Doc: Added a missing file. Doc: Fixed text in license headers.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-09-152-2/+2
| | |\
| | * | Doc: Some editing and tidying up.David Boddie2010-09-131-0/+4
| | | |
| | * | Doc: Fixed text in license headers.David Boddie2010-09-13149-147/+227
| | | |
| * | | Add missing images for dynamiclist example.Yann Bodson2010-09-155-0/+0
| | |/ | |/|
* | | Doc: Fixed a non-compiling example.David Boddie2010-09-161-0/+1
| | | | | | | | | | | | | | | | | | Tested with namespaced and non-namespaced Qt builds. Reviewed-by: Trust Me
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-161-1/+1
|\ \ \ | |/ /
| * | Remove debug, quiet warnings.Aaron McCarthy2010-09-131-1/+1
| | |
* | | Merge branch '4.7' of ../qt-doc-team into 4.7David Boddie2010-09-141-1/+1
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/Makefile.win32 src/corelib/io/qfsfileengine_win.cpp src/corelib/kernel/qeventdispatcher_win.cpp src/gui/dialogs/qfiledialog_win.cpp src/gui/inputmethod/qcoefepinputcontext_s60.cpp src/gui/text/qfontdatabase_win.cpp src/gui/util/qsystemtrayicon_win.cpp src/script/utils/qscriptdate.cpp tests/auto/qinputcontext/tst_qinputcontext.cpp tests/auto/qscriptengine/tst_qscriptengine.cpp
| | * Some small Solaris fixes.Pierre Rossi2010-08-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Sets the arch properly for solaris-cc-64-stlport on x86_64. This patch also removes three redundant lines in configure and disables qtconcurrent examples when it's not available. Reviewed-by: Thiago
* | | Merge branch 'fixesfor4.7' into 4.7David Boddie2010-09-134-3/+9
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: examples/tutorials/modelview/3_changingmodel/mymodel.h
| * | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | |
| * | | fix for compilation with namespaceRoland Wolf2010-09-082-2/+2
| | | |
| * | | minor formatting fixRoland Wolf2010-09-082-2/+2
| | | |
| * | | fix for compilation with namespaceRoland Wolf2010-09-084-6/+22
| |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-034-12/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits) Recognize @, #, $ and ` as word separators rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-09-034-12/+6
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) rebuild configure.exe Fix dependencies so JOM will handle parallellization properly Symbian: Disable IPv6 for now Doc: Fixed namespaced Qt build breakage in the model/view tutorial. Doc: Fixing links on index page and corecting HTML in the template. Accept empty authority segments in QUrl as different from not-present Doc: Adds line about non-support for Webkit on Solaris protect nil dictionary from release. Fix potential KERN-EXEC 0 on Symbian. Ukrainian translation updated Fix remote crash in delivering D-Bus calls with too few arguments Ensure that OpenGL contexts are attached to an NSView before first paint Doc: Updating the 3rd party lib used in Qt - including JQuery Doc: Changed the default URL to avoid a Flash plugin crash on x86-64. Reduce memory consumption of QtScript/JSC on Symbian Doc: Updated Supported Platforms page. Finished New binary of configure.exe with -mp/-no-mp option Turn Makefile.win32 into batch-mode, enable /MP and PCH Add option to enable -MP compile option for MSVC Rewrite ucstrcmp in terms of ucstrncmp ...
| | | * | Doc: Fixed namespaced Qt build breakage in the model/view tutorial.David Boddie2010-09-034-12/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: hjk
* | | | | compilation with namespaces was broken. fixedRoland Wolf2010-09-062-3/+1
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-031-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed compilation of the modelview tutorial on Windows. qdrawhelper: micro optimisation in fetchTransformBilinear Fix QStaticText copy constructor to also copy text option property qdrawhelper: Remove blend_transformed_bilinear_argb
| * | | Fixed compilation of the modelview tutorial on Windows.Kim Motoyoshi Kalland2010-09-031-1/+1
| |/ / | | | | | | | | | Reviewed-by: Trond
* | | Fix the same bug that was in the demo samegame, in the tutorial versionAlan Alpert2010-09-031-2/+2
|/ /
* | QString usage cleanupsOswald Buddenhagen2010-09-013-5/+5
| | | | | | | | | | - tr() already returns a QString, duh - use multi-arg arg() (heh)
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-319-3/+182
|\ \
| * | Add missing license headersJoona Petrell2010-08-313-0/+120
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Martin Jones
| * | Fix application exiting in embedded qml examplesJoona Petrell2010-08-309-3/+62
| | | | | | | | | | | | | | | Task-number: QTBUG-13178 Reviewed-by: Martin Jones
* | | Merge branch '4.7' of ../msculls-modelview-qdoc-enhancement into 4.7David Boddie2010-08-3039-552/+182
|\ \ \ | |/ / |/| |
| * | fixed compilation problemRoland Wolf2010-07-302-7/+13
| | |
| * | added missing filesRoland Wolf2010-07-304-0/+318
| | |
| * | added missing filesRoland Wolf2010-07-302-0/+119
| | |
| * | moving over work from 28b49e42f5bddec2d62e957f158cb848da134db8Roland Wolf2010-07-2939-941/+128
| | |
* | | Make declarative examples a bit more qt-like.Yann Bodson2010-08-2612-9/+9
| | |
* | | Document calling QObject methods from QML in Extending QML in C++ docs.Martin Jones2010-08-259-1/+431
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-242-5/+5
|\ \ \
| * | | Use SpringAnimation in relevant examples again.Michael Brasser2010-08-242-5/+5
| | | |
* | | | Enable mouse text selection in searchbox exampleMartin Jones2010-08-221-0/+1
|/ / / | | | | | | | | | | | | | | | Add selectByMouse: true Task-number: QTBUG-13024
* | | Fix previous commitJoona Petrell2010-08-181-1/+1
| | | | | | | | | | | | | | | Task-number: Reviewed-by: Trust me
* | | Add visible background element to declarative examples that didn't have anyJoona Petrell2010-08-183-40/+51
| | | | | | | | | | | | | | | | | | | | | Invisible areas cause redraw artifacts with OpenVg paint engine. Task-number: Reviewed-by: Martin Jones
* | | diagramscene example: fix leak and crashes.Olivier Goffart2010-08-161-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In MainWindow::deleteItem, if there is arrow selected, we need to clean up the items from this arrow. We need to delete them first so there is no arrow in the list anymore when we calls removeArrows (which before, deleted arrow that were possibly in the list, resulting in crashes) Also avoid leak by giving parents to objects that needs it, and destroying items. Reviewed-by: Geir Vattekar Task-number: QTBUG-12753 Merge-request: 775 Reviewed-by: Liang Qi <liang.qi@nokia.com>
* | | Merge branch '4.7' of ../oslo-staging-2 into 4.7David Boddie2010-08-132-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/examples/simpletreemodel.qdoc doc/src/examples/spinboxdelegate.qdoc doc/src/getting-started/demos.qdoc doc/src/getting-started/gettingstartedqml.qdoc doc/src/index.qdoc src/declarative/qml/qdeclarativeimageprovider.cpp
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-08-0920-0/+1603
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/getting-started/gettingstartedqml.qdoc
| * | | | Doc: Fixes to Qt Quick documentation.David Boddie2010-08-092-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me To-be-verified-by: Qt Doc Team
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-1137-1169/+1172
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-111-1/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: fix loading of module configs don't load modules from qt.prf add comment explaining why this file does magic instead of just voodoo configure.exe: don't write the QT_NAMESPACE define to .qmake.cache Don't build bearercloud example if Qt was build w/o SVG support
| | * | | | | Don't build bearercloud example if Qt was build w/o SVG supportAlex2010-08-111-1/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12791 Reviewed-by: David Laing
generated by cgit v0.12 at 2024-07-16 14:32:26 (GMT)