summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-169-26/+632
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (34 commits) Fix duplicate project entry in visual studio solution file. Doc qdoc: Added the index and fixed images in the extra files list. Speed up qsTr() by caching the translation context Crash while printing from the portedcanvas example on Mac Cocoa. qdoc: Fixed .qdocconf files for assistant. Disable debug-only framework builds on Mac. Compile (with -no-pch) Add missing QT_NO_BEARERMANAGEMENT ifdefs. Introduce a qconfig feature for Bearer Management Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac ...
| * Fix duplicate project entry in visual studio solution file.Andrew den Exter2010-04-161-1/+1
| | | | | | | | | | | | The marshal project was being appended to SUBDIRS twice. Reviewed-by: Justin McPherson
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-158-25/+631
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (24 commits) Fix MOBILITY-404 Remove holes in bearer management data structures. Don't link bearer plugins against QtGui unnecessarily. Added missing newline after warning message when using -L with qml Doc: updating scripts Fixed a crash on embedded due to uninitialized pointer. Fix a race where QThread::exit() is "lost" when called after start() qdoc: Removed all <table> attributes in favor of using css. Autotest failure: dialogModality test fails on cocoa (macgui) Force the bic test to compile in 32-bit mode on Mac Revert "Doc: Updating design files." Remove statically allocated pixmaps through the post routine qdoc: Checked for empty title. qdoc: Added TOC to class ref pages. Cocoa: qwidget autotest fails on setToolTip Compile on Mac OS 10.4 Bearer management changes from Qt Mobility (7a5ff985) Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. ...
| | * Merge remote branch 'staging/4.7' into bearermanagement/mobility-changes-squashAaron McCarthy2010-04-141-1/+1
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-141-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors" Fix margins for placeholdertext in QLineEdit qdoc: Added TOC to module pages. Doc: Updating design files. Doc: Fixing design bugs. Updating the index page and script/style files. Adding some image files. qdoc: Changed <ul> elements in TOC. Fix QTextDocument::undo() cursor positioning
| | | | * Partially revert "Sunstudio12.1(5.10): Fix compile errors GTK style and ↵Thiago Macieira2010-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | other minor compile errors" The compile fix for SunCC caused a build failure for MinGW with gcc 3.4. However, QtConcurrent is not supported for Sun CC, so revert the fix (let mingw compile and SunCC break). This reverts part of commit a354e98838e67e9bbd9473d4cd42b89f45d0e3fe (MR 547).
| | * | | Bearer management changes from Qt Mobility (7a5ff985)Aaron McCarthy2010-04-147-24/+630
| | |/ / | | | | | | | | | | | | 7a5ff9859f5775915ae80c287f51c772599c2379
* | | | Fix localFont path in fonts example.Yann Bodson2010-04-151-2/+2
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1373-681/+1184
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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 ...
| * | Example fixesBea Lam2010-04-1310-83/+110
| | |
| * | Fix code style in examplesBea Lam2010-04-1358-487/+881
| | |
| * | Make demo code more consistent with example code in terms of variableBea Lam2010-04-131-1/+1
| | | | | | | | | | | | naming and code style.
| * | Fix score from previous changeBea Lam2010-04-131-1/+1
| | |
| * | Doc improvementsBea Lam2010-04-131-1/+1
| | |
| * | Fix example code styleBea Lam2010-04-1314-124/+206
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-131-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix qmake.pro after Symbian alternate build system integration Fix compile error Don't try to use so much permissions, use something a lot more sane A bit saner suggestion Remove not needed permissions Make compile on Symbian
| * | Don't try to use so much permissions, use something a lot more saneThomas Zander2010-04-121-1/+1
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-138-31/+54
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Revert Merge Request 551. This introduces regressions to Qt. Fixed scroll area size calculation on Mac. Fix a race where QThread::exit() is "lost" when called after start() make a partial build of linguist in no-gui config make the code less of a trap fix build from top level Partially revert MR 543 changes to Linguist. Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. ...
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-128-31/+54
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| | * Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-078-31/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-12126-645/+714
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (130 commits) Warning Read Maemo orientation at startup Exclude gestures from examples autotest Exclude proxywidgets from examples autotest Fix crash on QScriptProgram destruction doc fixes Start documenting coding conventions Adds missing qml file to qdeclarativeflipable autotest Revert "Better reporting of extension plugin loading errors." Doc Fix graphicswidget auto-test. Add Mac OS X bundle description for qml runtime Cleanup Disallow writes to read-only value type properties Allow undefined to be assigned to QVariant properties Add a Qt.isQtObject() method Fix crash in QML library imports Remove QT_VERSION checks in QML List properties aren't read-only Small doc fix. ...
| * | Example code style improvementsBea Lam2010-04-097-206/+195
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-091-0/+8
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0910-139/+122
| | |\ \
| | * | | self-docWarwick Allison2010-04-091-0/+8
| | | | |
| * | | | Replace "property var " with "property variant " in QML codeAaron Kennedy2010-04-098-14/+14
| | |/ / | |/| |
| * | | Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-091-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit deletes the uneeded classes/declarations since we have now an inline support for QGraphicsObject based classes. QGraphicsLayout bindings works the same way because the layout property has been added to QGraphicsWidget. The only feature that is missing for now (because of the deletion of GraphicsObjectContainer) is the anchoring support. We will probably take a look on how to support this feature properly with no wrapper. Task-number:QTBUG-9456 Reviewed-by:Michael Brasser
| * | | Straighten board linesBea Lam2010-04-091-0/+0
| | | |
| * | | More tutorial improvmentsBea Lam2010-04-098-119/+107
| |/ /
| * | Fix call to saveHighScores() and restore game timer.Bea Lam2010-04-083-6/+4
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-08121-289/+379
| |\ \ | | | | | | | | | | | | | | | | Conflicts: examples/declarative/tutorials/samegame/samegame4/content/samegame.js
| | * | Fix warning in declarative/examples/velocityLeonardo Sobral Cunha2010-04-081-2/+6
| | | |
| | * | Fix samegame4 tutorial codeLeonardo Sobral Cunha2010-04-082-12/+3
| | | |
| | * | Missing fileYann Bodson2010-04-081-0/+0
| | | |
| | * | Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-088-16/+15
| | | |
| | * | Add running of examples to quality gate.Warwick Allison2010-04-082-2/+2
| | | | | | | | | | | | | | | | Fix broken examples too.
| | * | Improve velocity exampleYann Bodson2010-04-084-135/+84
| | | |
| | * | Missing fileAaron Kennedy2010-04-082-1/+146
| | | |
| | * | Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-08115-116/+116
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-081-0/+1
| | |\ \
| | * | | Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-085-8/+10
| | | |/ | | |/| | | | | | | | | wrap remains for a little while, and will produce a warning.
| * | | Improve example code - rename variables, remove redundant ids.Bea Lam2010-04-0813-156/+156
| | |/ | |/|
| * | needs focusWarwick Allison2010-04-081-0/+1
| |/
* | Fixing the missing "\\"Aleksandar Sasha Babic2010-04-081-1/+1
|/ | | | Reviewed-by: TrustMe
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-061-1/+1
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a coding style issue of the GTK style Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errors Added variable QMAKE_TARGET.arch to qmake to be used with MSVC++
| * Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | GTK Style A QHashableLatin1Literal was a bit too clever for sunstudio. Added and alternate constructor for sunstudio(ifdef) Should not affect other compilers. Other: Minor compile fixes, extra semicolon after macros etc. Merge-request: 547 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-061-0/+27
|\ \ | |/ |/| | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| * Labs (experimental) Gesture support.Warwick Allison2010-04-061-0/+27
| | | | | | | | By popular demand.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-021-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Make s60main static lib not depend on QtCore" Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-011-0/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()