summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-3017-21/+93
|\ | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp qmake/generators/win32/msvc_vcxproj.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-08-2611-20/+92
| |\
| | * Add quit buttons to declarative demosJoona Petrell2010-08-2611-20/+92
| | | | | | | | | | | | | | | Task-number: QTBUG-13048 Reviewed-by: Martin Jones
| * | Make declarative examples a bit more qt-like.Yann Bodson2010-08-267-1/+1
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-2514-211/+290
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp src/opengl/opengl.pro src/opengl/qgl_p.h src/plugins/bearer/connman/qconnmanservice_linux.cpp tests/auto/qpainter/tst_qpainter.cpp tools/assistant/tools/assistant/helpviewer_qwv.h tools/assistant/tools/assistant/openpageswidget.h
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-201-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Changes to the index page and second level pages linking to the index page. Use Ctrl rather than Alt for switching tabs in the demo browser Doc: fixing creator bugs, removing menus and textbox in the header Update Japanese translations Ukrainian translation updated qtconfig and qvfb internationalization fixes add full width characters to ending() in linguist QFileDialog::HideNameFilterDetails breaks Cocoa QFileDIalog filter qdoc: Changed id attribute to be a UUID. just build connman and networkmanager plugins on linux
| | * Use Ctrl rather than Alt for switching tabs in the demo browserTor Arne Vestbø2010-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | Alt+1, Alt+2, etc produce actual symbols on some keyboard layouts, for example Norwegian, which prevents you from typing the @ symbol. Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-08-206-145/+215
| |\ \
| | * | Fix minehunt demo for SymbianJoona Petrell2010-08-206-145/+215
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8927 Reviewed-by: Alan Alpert
| * | | Allow QML Quit buttons to work inside QtDemo.Alan Alpert2010-08-203-2/+10
| |/ / | | | | | | | | | Also changes the line documenting the quit signal on QDeclarativeEngine.
| * | Add a quit button to declarative examples in QtDemoAlan Alpert2010-08-201-33/+25
| | |
| * | Without Declarative, still build and run QtDemoAlan Alpert2010-08-194-13/+33
| |/ | | | | | | | | | | | | If declarative is configured out then QtDemo will now still build, with all declarative demos disabled. Task-number: QTBUG-12983
| * Fix game could not be restartedmae2010-08-162-16/+5
| | | | | | | | Task-number: QT-3668
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-1321-114/+129
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qpainter.cpp src/gui/text/qtextengine.cpp tests/auto/qimage/tst_qimage.cpp tests/auto/qpainter/tst_qpainter.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf
| * Fixed build failureGareth Stockwell2010-08-123-4/+4
| | | | | | | | Task-number: QTBUG-12713
| * Do not include Spectrum Analyzer demo in static buildsGareth Stockwell2010-08-112-1/+5
| | | | | | | | | | | | | | | | | | This demo includes a 3rd party library which is licensed under the LGPL. As such, the demo application may only link to the library dynamically. Task-number: QTBUG-12713 Reviewed-by: Justin McPherson
| * Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-094-4/+4
| | | | | | | | | | Reviewer: David Boddie Task number: QTBUG-11938
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-041-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix the remote command delimiter, this has cahnged at some point. Assistant: Revert previous commit, issue was already fixed. fix line endings fix compilation with -plugin-kbd-* Fix typo in docs Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS Fix compilation with QT_NO_DBUS fix inaccurate comment
| | * Fix the remote command delimiter, this has cahnged at some point.kh12010-08-041-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-041-2/+15
| |\ \ | | |/ | |/| | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Don't crash if an item is removed from the scene while it is gaining focus. Add missing snippet file Snake game cannot be restarted
| | * Snake game cannot be restartedmae2010-08-031-2/+15
| | | | | | | | | | | | Task-id: QT-3668
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-031-2/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) Removed the unfinished sentence. Fix for QTBUG-10173. Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173 Unbreak QImage::rgbSwapped() for many image formats. Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa) Doc: Adding content to installation guide and fixing printing bugs Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget Made changes to qdoc to allow it to accept a "style level" flag Doc: Correcting bugs in the CSS Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-031-2/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. Simplify network manager settings code. Use an enum to return the bearer type of a network configuration. Rename QNetworkConfiguration::bearerName() function.
| | | * Modified qtdemo so error does not appear when there is no demo/example ↵Kevin Wright2010-08-021-2/+2
| | | | | | | | | | | | | | | | description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
| * | | Fix photo positioning bug in flickr demo.Yann Bodson2010-08-033-87/+87
| |/ / | | | | | | | | | Task-number: QTBUG-3669
| * | Make it possible to manually set the orientation of QML Viewer on SymbianJoona Petrell2010-08-032-9/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-12142 Reviewed-by: Warwick Allison This patch brings ability to switch QML Viewer's orientation between auto-orientation (=follow sensor), portrait and landscape orientations (lock orientation) on Symbian. It provides same orientation options as Qt Creator 2.1's Qt QML Standalone Application creation wizard. Also, menu item rotateOrientation now works on Symbian, but it's hidden when orientation mode is set to auto-orientation. Property runtime.orientation has been switched back to supporting four-way orientation on Symbian, previously it only updated values between portrait and landscape. If your application only supports landscape or portrait modes, just don't react to the inverted orientations. Added orientation example screenorientation under examples/declarative. The patch includes a fix for calculator example, which rotated to wrong direction when switching from portrait to landscape. Also, improved qdeclarativeviewer unit tests. Changes have been tested to work on Windows, Linux and Symbian^3.
| * Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-295-5/+5
| | | | | | | | QTBUG-11938 and QTBUG-10801
| * Remove warnings in photoviewer demo.Yann Bodson2010-07-291-1/+1
| | | | | | | | Task-number: QTBUG-12494
| * Uncomment code accidentally removed with ↵Aaron Kennedy2010-07-291-2/+0
| | | | | | | | | | | | 1937adaab5861ced44813c6a4b0bff1c3750ecd3 QTBUG-3620
* | Replace gluPerspective with qgluPerspective.Bjørn Erik Nilsen2010-08-104-2/+14
| | | | | | | | | | | | | | | | GLU dependency was removed in commit: c67b4cac2e53ae77c4e16487838c17be85e73aa3, so we have to implement the function ourselves. Reviewed-by: kim
* | Remove the use of deprecated qVariant*Olivier Goffart2010-08-067-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qVariantValue</qvariant_cast</'" qVariantValue git grep -O"sed -i 's/qVariantSetValue(\([^&*\(),]*\), */\\1.setValue(/'" qVariantSetValue git grep -O"sed -i 's/qVariantSetValue *<\([^>]*\)> *(\([^&*\(),]*\), */\\2.setValue<\\1>(/'" qVariantSetValue git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantCanConvert *<\([^>]*\)> *(\([^&*\(),]*([^&*\(),]*)\))/\\2.canConvert<\\1>()/g'" qVariantCanConvert git grep -O"sed -i 's/qVariantFromValue\( *[(<]\)/QVariant::fromValue\\1/'" qVariantFromValue git checkout src/corelib/kernal/qvariant* Rev-by: dev mailing list
* | Remove the use of deprecated qFindChild(ren)Olivier Goffart2010-08-0611-13/+13
|/ | | | | | | | | | | | | Test directory untouched. This just apply those regexp: git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(this,* */f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(&\([^\(),]*\),* */\\2.f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*()\),* */\\2->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\):\([^\(),]*\),* */(\\2:\\3)->f\\1(/'" qFindChild git grep -O"sed -i 's/qF\(indChildr*e*n*<[^>]*>\)(\([^\(),]*\),* */\\2->f\\1(/'" qFindChild Rev-by: dev mailing list
* QML focus API updates.Michael Brasser2010-07-213-3/+3
| | | | | | | | | The wantsFocus property has been renamed to activeFocus, to better reflect its value. Reading and writing the focus property is also now consistent -- this property represents focus within a scope. Other small changes were made to keep things consistent with the new naming. Reviewed-by: Aaron Kennedy
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-1918-107/+184
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Convert examples and demos to use Bearer Management. Fixes deployment rules for embedded qml demos application. Fix build on Symbian.
| * Convert examples and demos to use Bearer Management.Aaron McCarthy2010-07-1911-107/+177
| | | | | | | | Task-number: QTBUG-10439
| * Fixes deployment rules for embedded qml demos application.Aaron McCarthy2010-07-197-0/+7
| | | | | | | | | | | | The deployment rules for the qml resources in the embedded qml demo applications were not being generated correctly as data_caging_paths was not being loaded.
* | Remove the -use-blur option from qtdemoAlan Alpert2010-07-195-56/+1
| | | | | | | | | | | | It relied on the now missing pixmap property. Since it isn't used, it doesn't seem worth the effort to update it to use a declarative image provider instead.
* | Add label to explain how to exit QML demosAlan Alpert2010-07-191-5/+33
| | | | | | | | | | | | | | Some people didn't figure it out intuitively, so extra help is now provided. Task-number: QTBUG-11868
* | Fix SamegameAlan Alpert2010-07-191-2/+2
|/ | | | | | | Change to Behavior from Follow means that some of the previous assumptions are now incorrect. Script logic has been fixed. Task-number: QTBUG-12246
* Enter key performs same action as Return key in QML demos.Martin Jones2010-07-145-0/+9
| | | | N900 has an Enter key, not a return key
* Follow -> Behaviormae2010-07-082-8/+10
| | | | Replace the usages of Follows with Behaviors, update docs.
* Add Symbian support for runtime.orientation propertyJoona Petrell2010-07-072-9/+22
| | | | | Task-number: Reviewed-by: Martin Jones
* Spectrum demo: fixed installationGareth Stockwell2010-07-062-10/+11
| | | | | | | | | All binaries must be written into $$QT_BUILD_DIR/demos/spectrum in order for them to be correctly installed. Task-number: QTBUG-11572 Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
* Spectrum build: fixed DLL rpathGareth Stockwell2010-07-062-60/+3
| | | | | | | | | | Rather than explicitly modifying LD_LIBRARY_PATH using a shell script when the application is launched, the relative path from the application binary to the FFT library is encoded in the application using an --rpath flag. Task-number: QTBUG-11756 Reviewed-by: Andy Shaw
* Hide some more files from git-status.axis2010-07-022-0/+4
|
* Fixed deployment locations for various profiles.axis2010-07-022-2/+2
| | | | RevBy: Trust me
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-011-4/+11
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QSslSocket::systemCaCertificates(): have one common case for all Unices Fixed QX11EmbedContainer. Improved a bit detection of a touch screen on Windows. qdoc: Fixed invalid format in the html header. link glu32 before opengl32 Stopped trying to output QML property list in 2 columns
| * qdoc: Fixed invalid format in the html header.Martin Smith2010-07-011-4/+11
| | | | | | | | Task-number: QTBUG-11803
* | Fix bug in SameGame's dialog componentAlan Alpert2010-07-012-1/+3
| | | | | | | | | | | | Was emitting closed after already being closed. Task-number: QTBUG-11812
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-07-0117-24/+27
|\ \