summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | Fix cppextension examples.Martin Jones2010-08-1110-20/+20
| |/ / | | | | | | | | | | | | Print a useful message on error. Specify the QML url correctly.
| * | Adding Getting Started files. Auto test passes.Jerome Pasion2010-08-0620-0/+1603
| | |
| * | Revert "Doc: Adding GS QML example files"Alan Alpert2010-08-0621-1617/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f13ebf52a0d091c6c72c97d2a13311e1e7c4a5cf. The given example does not meet the autotest requirements for QML examples. These involve that it starts without error messages, and that it follows our naming convention of the start file starting with a lowercase letter. Please run the tests/auto/declarative/examples before pushing new declarative examples. If new examples should be exempted from these checks, add them to the list of exceptions in that autotest.
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0621-0/+1617
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4. Remove useless QString::clear() from QSharedData example snippet. Move note on connectToBus() not actually being able to reconnect to Designer: Prevent rich text from being copied into style sheets. QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction qdoc: Removed three unused config variables. qdoc: Cleaned up the application option specification and use. Doc: Adding GS QML example files Doc: Images for QML GS Doc: Editied version of QML GS Doc: Adding text to GS page Fix link error when building Bearer application with Qt Mobility Doc: nesting up orphant pages
| * | Rename example component file for clarityBea Lam2010-08-054-8/+22
| | | | | | | | | | | | Task-number: QTBUG-12633
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-08-0521-0/+1617
|\ \ \ | | |/ | |/|
| * | Doc: Adding GS QML example filesMorten Engvoldsen2010-08-0521-0/+1617
| |/
* | Doc: Fixed typo in a shortcut string.David Boddie2010-08-041-1/+1
|/ | | | | Reviewed-by: Trust Me Task-number: QTBUG-12355
* fix line endingsOswald Buddenhagen2010-08-043-82/+82
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-047-76/+496
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Assistant: Include QML docs Fixed the curve descriptions and added descriptions for overshoot, amplitude, and period. Fix for QTBUG-7940. Cocoa: Showing a QFontDialog first shows it in the bottom-left corner Mac: fix regression from 65a673f that makes some buttons unclickable Fix deadlocks in ICD and NetworkManager engines. new icons for cell and bt networks. Doc: updating getting started docs - not finished Doc: removing empty links in bread crumb add convience methods for getting ethernet service details. fix spelling fix crash try harder to get cell name
| * new icons for cell and bt networks.Lorn Potter2010-08-037-76/+496
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-041-1/+1
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Assigned valid UID3 for fortuneserver example
| * Assigned valid UID3 for fortuneserver exampleMiikka Heikkinen2010-08-031-1/+1
| | | | | | | | | | | | | | | | Previous UID used by fortuneserver was already assigned for anomaly demo. Task-number: QTBUG-12276 Reviewed-by: TrustMe
* | Fixed the addressbook tutorial and some spelling mistakes. Fix for ↵Jerome Pasion2010-08-0312-13/+18
| | | | | | | | QTBUG-7071 and QTBUG-10173
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-032-15/+23
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-021-10/+18
| | | | | | | | | | Task-number: QTBUG-12378 Reviewed-by: Alex
| * Rename QNetworkConfiguration::bearerName() function.Aaron McCarthy2010-08-022-13/+13
| | | | | | | | | | | | | | | | | | | | | | bearerName() -> bearerTypeName(). bearerName() is deprecated and converted into an inline function which calls bearerTypeName(). This is required to keep existing code source compatible between Qt Mobility 1.0.x and Qt 4.7. Task-number: QTBUG-12378 Reviewed-by: Alex
* | Make it possible to manually set the orientation of QML Viewer on SymbianJoona Petrell2010-08-035-0/+476
|/ | | | | | | | | | | | | | | | | | | | 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.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-301-11/+13
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash on Desktop platforms.
| * Fix crash on Desktop platforms.Aaron McCarthy2010-07-291-11/+13
| | | | | | | | | | | | Missing check for null networkSession. Task-number: QTBUG-12501
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-07-291-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb ) Workaround for QTBUG-8013: Do not return an ascent of 0 Fix crash when all the items in a QListView are hidden Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window One more .pro fix for deprecated INCPATH Fix Rhys' qmake warnings Fixed QVideoSurfaceFormat::isValid()
| * Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-291-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/itemviews/qlistview.cpp tests/auto/qlistview/tst_qlistview.cpp tests/auto/qnetworkreply/test/test.pro tests/auto/qsocks5socketengine/qsocks5socketengine.pro
| | * Fix Rhys' qmake warningsMarkus Goetz2010-07-221-1/+1
| | |
* | | Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-2917-27/+27
|/ / | | | | | | QTBUG-11938 and QTBUG-10801
* | Fix image sourceBea Lam2010-07-291-1/+1
| | | | | | | | Task-number: QTBUG-12493
* | Avoid binding loop warningsBea Lam2010-07-291-1/+2
| | | | | | | | Task-number: QTBUG-12469
* | Adding missing imageKevin Wright2010-07-271-0/+0
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-2726-9/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QT_NO_DATESTRING Check the gesturemanager pointer before accessing it. Added files that had been renamed. Modified file/directory names and text to remove disallowed terminology. Cherry pick fix for MOBILITY-1077 from Qt Mobility. Fix typo in docs. Cherry pick fix for MOBILITY-1145 from Qt Mobility. Cherry pick fix for MOBILITY-1144 from Qt Mobility. Fixed the following sub-tasks for QTBUG-12192
| * \ Merge branch '4.7' of http://git.scm.dev.nokia.troll.no/qt/oslo-staging-1 ↵Kevin Wright2010-07-271-0/+5
| |\ \ | | | | | | | | | | | | into 4.7
| | * | Cherry pick fix for MOBILITY-1077 from Qt Mobility.Aaron McCarthy2010-07-271-0/+5
| | | | | | | | | | | | | | | | | | | | 7ef45318255c5cf1f10508753c9a2c55fc2cb8c0 321bd8b7b54e34a983b1ba142af836cf3e153a66
| * | | Added files that had been renamed.Kevin Wright2010-07-2721-0/+1533
| | | |
| * | | Modified file/directory names and text to remove disallowed terminology.Kevin Wright2010-07-2723-1522/+1
| |/ /
* | | various doc fixesBea Lam2010-07-272-2/+2
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-238-16/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (42 commits) Update QtDeclarative def files Fix crash in MouseArea Compile Fixes undeleted timers (and endless warning from the event loop about Remove unneeded member variable. Fix test. Generalize qml "registration" Fix compiler warning Fix TextInput echoMode autotest on Linux Reuse QML lexer to simplify .pragma script logic Fix TextEdit text attribute and text stored in the internal QTextDocument having different contents Remove QDeclarativeItem::childrenChanged() signal overload Update QtGui and QtDeclarative def files Make rootContext and engine pointers in QDeclarativeView API const Add additional QVariant benchmarks. Allow MouseArea dragging to filter mouse events from descendants Expand QDeclarativeExtensionPlugin docs Add missing snippet files Expand QtObject doc Indicate default values ...
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-218-16/+22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits) Expand QDeclarativeExtensionPlugin docs Add missing snippet files Expand QtObject doc Indicate default values Use snippets instead to avoid quoting license headers Rename remaining 'wantsFocus'. Bounding rect of text was not always calculated correctly. Add QML tutorials to the tutorials page QML focus API updates. Do not show copyright header in documentation. Ensure redirects (and indeed all reply process) is done in the right thread. Only ignore the same target value for a Behavior when it is running. Fix clock example: make sure hands always moves forward. font.letterSpacing used percentage rather than absolute values. Rewinding AnchorChanges should not make target item's implicit width and height explicit Compile: include <float.h> for usage of FLT_MAX. Restore the FLT_MAX define. Make Item::transformOriginPoint read-only Ensure the boundingRect() of Text is correctly calculated. Better defaults for MouseArea's drag. ...
| | * | Expand QDeclarativeExtensionPlugin docsBea Lam2010-07-212-1/+8
| | | |
| | * | QML focus API updates.Michael Brasser2010-07-215-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Fix clock example: make sure hands always moves forward.Michael Brasser2010-07-211-3/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-12292
* | | | Show Service Network members in priority order.Aaron McCarthy2010-07-231-9/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | The configurations returned from QNetworkConfiguration::children() are guaranteed to be in priority order. Ensure that this order is reflected in the tree view. Task-number: QTBUG-11678 RevBy: juhvu <qt-info@nokia.com>
* | | Minor modification to allow compilation on WinCE and AIX. Removed executable ↵Toby Tomkins2010-07-2139-1/+1
|/ / | | | | | | attributes.
* | Examples: Fix compilation with namespace.ck2010-07-198-8/+10
| |