summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Added documentation for the quick1 demo applicationsv5.0.0-rc2Venugopal Shivashankar2012-12-1215-0/+398
| | | | | Change-Id: Iebc7c1e7202fed95abf231913b48cec75675e7f1 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Backport PathView currentIndex fixes from Qt 5Bea Lam2012-12-123-37/+485
| | | | | | | | | | | | Backport 447e5acb880ebda498891623dc4009984cb73bc6 and 0fc361f96b06ba318e70610e46beb421753cae9d which fix bugs related to currentIndex. The first commit ensures currentIndex=0 when all items are removed; the second ensures that the initial currentIndex value is respected and also resets the view correctly if the model changes. Change-Id: I73266a211001a54163be8415d449802ff077a72e Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Fixed install path of tictactoe exampleOliver Wolff2012-12-121-1/+1
| | | | | Change-Id: I710152e833a74956060772d5e01772dea0298384 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Process imports in the order they appear in the code.Robin Burchell2012-12-1230-8/+177
| | | | | | | | | | | | | | | By placing imports into a hash keyed by the qualifier, imports were not processed in the order they appeared in the source. This is perhaps not a major problem, but it is nice to have predictability. This becomes more important in Qt 5, when QHash is randomly seeded at application startup, as alterations to order could have strange side effects on code. Reported-by: Maciej Blomberg Change-Id: Ibd34fab1eed4bc727b498ba4684c62d801ae713b Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix crash when mapping coordinates to & from the root item.Nicolas Tisserand2012-12-121-4/+18
| | | | | | | | | | | | | | | The crash triggered by our (supported & documented) use-cases (calling map{From,To}Item with a null value), has been introduced earlier this year, by this change: https://qt.gitorious.org/qt/qt/commit/bec02b3f3 Also: * Clarify QDeclarativeItem::map{From,To}Item statement ordering. * Handle the engine-less item corner case. Change-Id: I33678f7267a4b624bfa61247a643f37ad2ec735d Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Do not build Qt Quick 1 documentation and example manifest.hjk2012-12-111-1/+4
| | | | | | | | | It was decided to leave in the examples as reference, but not obviously refer to them in the documentation. Change-Id: I932a2a3fc983d5a8a63855ae94d509161fdfada4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* centralize and fixup example sources install targetsOliver Wolff2012-12-11448-353/+3837
| | | | | | | | follow respective change in qtbase Change-Id: I15346e16cd1d6f30cf32a77284b5f19b1dd2a7a9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* make use of qt_headersclean.prfOswald Buddenhagen2012-12-112-53/+2
| | | | | Change-Id: I55d94c152217e419a2c8f04d174996a71eb933a5 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Make sure Q_DECLARE_METATYPE is used in all TUs it is registered in.Stephen Kelly2012-12-111-1/+2
| | | | | Change-Id: I0aea3bfcae77d22f04166ce7e04c9a4898e7f99b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix typo in metatype registration.Stephen Kelly2012-12-111-1/+1
| | | | | Change-Id: If0fd01464160259d634770908d5c284db2bbe582 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add qtdeclarative.qdocconf to get a example_manifest.xmlhjk2012-12-11555-1/+34
| | | | | Change-Id: I52b87947559c10d3e60af81fe8d4f3189dd1614e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add PLUGIN_CLASS_NAME to qtquick1 pluginsMiikka Heikkinen2012-12-104-0/+4
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ia32d3dad2136d0fda468a538fe9be989e72c79eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Stabilize tst_qdeclarativetimerAlan Alpert2012-12-052-24/+40
| | | | | | | | Use consistent timing on the unified timer instead of qWait Manual cherry-pick of 2ebb2fce87642ef0da8629bdb27164fffbdcdcb9 Change-Id: I76c402081062f7f6849bd421e90bc96f08e8d95a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Remove 'com/nokia' string from autotestAlan Alpert2012-12-051-11/+11
| | | | | | | Missed this bit in commit 905537e032095790b4ac1607c5ca0de2ad412476 Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b6a Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Doc: Added documentation for the Qt Quick1 examplesVenugopal Shivashankar2012-12-051-293/+72
| | | | | | | Task-number: QTBUG-27515 Change-Id: I7a38158e44e69ac151842a0a49865fe72224ece8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* remove unnessary reference to QGuiApplicationv5.0.0-rc1Jing Bai2012-12-051-1/+11
| | | | | | | | | | In QDeclarativeEngine initialization,it goes through all types, including Font in Gui. This causes a crash when using QDeclarativeEngine with QCoreApplication. Task-number: QTBUG-28375 Change-Id: Idce2a046db7e52a1c13b8c5c0315e36873f7e27d Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Remove 'com.nokia' string from autotestAlan Alpert2012-12-0511-66/+66
| | | | | Change-Id: Ic318dbe7a48412e9689ca0f4506c7098d9f48b5f Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* sync.profile: Point dependencies to 'refs/heads/stable'Sergio Ahumada2012-12-041-8/+8
| | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: Ic8e80a8db60c8fae950e1327bc8ac66c1940872d Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* remove symbian & maemo5 vestigesOswald Buddenhagen2012-12-047-60/+0
| | | | | Change-Id: I4c02f91abde94d9ee7d154efa6eb371e1a8dfd71 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* EngineDebug: Updated and renamed serviceAurindam Jana2012-12-014-72/+96
| | | | | | | | | | | Updated service to include parent ids. Since this will break client compatibility, the service has been renamed to 'DeclarativeDebugger' from 'QDeclarativeEngine'. This is effectively a backport of the 'QmlDebugger' service from Qt5. Change-Id: I7e3c9b9c321278dd24bd17ae2efdc690307cba8a Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Limit case-sensitivity check in QML to file names.Friedemann Kleint2012-12-013-6/+28
| | | | | | | | | | Provide for checking relative paths only; default to file names. Currently, the checking triggers on a drive letters and installation folder names, which is too strict. Task-number: QTBUG-28277 Change-Id: I2056a39b605f7891d2c3e395efc6bc541aa7e470 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Mark randomly failing test as insignificantLars Knoll2012-12-011-0/+2
| | | | | Change-Id: Ie78eda64966b6d594123db91f908e3c84b1966b6 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Qml1PluginDump: Prevent crash if run without WMKai Koehne2012-12-011-0/+3
| | | | | | | Make sure that the minimal platform plugin is used by default. Change-Id: I32f5ae128f2134f8955d4bdb14974059b98209eb Reviewed-by: hjk <qthjk@ovi.com>
* Fix QML XmlHttpRequest Insecure Redirection FlawRichard Moore2012-12-011-3/+5
| | | | | | | | | Fix the redirection flaw in QML's XmlHttpRequest implementation that is described in http://lists.qt-project.org/pipermail/announce/2012-November/000014.html Change-Id: I5190e63648f4664753003b70c20cb8dbd20ab150 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make tst_examples::namingConvention not failKai Koehne2012-12-011-1/+7
| | | | | | | | | The test seems to be wrong. Keep the warning though if other tests actually rely on the behavior. Task-number: QTBUG-28271 Change-Id: I93b952156b96b5d07ab5177ffce6152e77479c2d Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Rename focus document to make it clear it's not for QML in generalShawn Rutledge2012-12-016-6/+6
| | | | | | | | Old doc for Qt Quick 1, and qtdeclarative module has its own modified copy already. Change-Id: I5b6c10be59dd4948ba21a2e03f2a61cebf541fcb Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix tst_qdeclarative buildSimon Hausmann2012-12-011-1/+1
| | | | | Change-Id: Ifb326e09a5254d1518d7d18c1994b36c349bdeb6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QtQuick1: Add generated .qmltypesKai Koehne2012-11-298-1/+4374
| | | | | Change-Id: I4970676013d374db528c693375dd9ba2a3108908 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Ensure QDeclarativeTextLayout uses the correct penChris Adams2012-11-291-1/+12
| | | | | | | | | | | | | | | | | | When a styled text specifies a font region with some color set, QDeclarativeTextLayout used to revert to using a default-constructed (black-colored) pen for text occurring after the </font> tag, rather than the "default" (property-defined) color. This commit ensures that the correct pen is used, by setting the pen of the "inert" painter to be an invalid color rather than a default constructed pen. It then detects when the current pen transitions back to this invalid pen, and switches back to using the default color. Task-number: QTBUG-28135 Change-Id: I6bcc43fbcf7fb2c680959d27b1422364ebb473ae Reviewed-by: Alan Alpert <aalpert@rim.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Observe GL context loss in ShaderEffectItemChris Adams2012-11-282-34/+7
| | | | | | | | | | | | | | | Recreate the shader program as required when the GL context changes. Also delete the shader program when the ShaderEffectItem is deactivated, to save graphics memory. Previously, this was done only for Symbian platforms, and in a suboptimal fashion. This patch implements the behaviour for all platforms in a more optimal manner. Task-number: QTBUG-28136 Change-Id: I8281e77f7285ea0046bdf092ab827cae3b00a6d2 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Alan Alpert <aalpert@rim.com>
* The LGPL license info should refer only to Qt DeclarativeLars Knoll2012-11-283-6/+23
| | | | | | | | Qt Quick (2) is not using Qt Script and thus not bound to LGPL terms. Change-Id: I2ec2e361563bff0e27f85c6273e6cfa38a3759ae Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QML file loading: honor synchronous requests made through QNAMAlan Alpert2012-11-283-8/+78
| | | | | | | | | | So that it can skip loading state when the underlying QNetworkReply is already finished. Change-Id: Ic2d26271868b64bf8a411b4b54d7e5be7ee5d2b5 Parts-of-the-patch-by: Jeremy Nicholl Task-number: QTBUG-27723 Reviewed-by: Alan Alpert <aalpert@rim.com>
* QtQuick1: Fix ObserverModeAurindam Jana2012-11-2711-2/+407
| | | | | | | | Although ObserverMode was enabled, the messages to the plugin were not delivered and hence the feature did not work. Change-Id: I58ec83a4ee727b32833c011a4942cde0cd6a02c8 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Qml1PluginDump: Fix dumping of GUI typesKai Koehne2012-11-272-3/+3
| | | | | | | | | | Make sure that Gui types are dumped to for -builtins. For QGuiApplication / type() == QApplication::Tty they weren't registered otherwise (change e5b200fa06e). Task-number: QTBUG-28206 Change-Id: Ia6c0902f465ece5411a37b9c23b390172dc58f4b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Accept missing semicolon after do-while statement.Erik Verbruggen2012-11-268-802/+874
| | | | | | | | | | | Although not valid according to ECMA 5.1, both JSC and V8 accept a missing semicolon after a do-while loop. (Both JSC and V8 do not do this through automatic semicolon insertion, but handle it as a special case.) This is a "port" of a similair change done in the qtdeclarative module. Change-Id: I417cf18abb75e7040c48894b8f8f68afc41547fe Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Compile with QT_NO_CLIPBOARDAndrew den Exter2012-11-261-0/+2
| | | | | | Change-Id: Icfc2b14b1e5ff5eab5fd4af3a6ffbebea6f89e84 Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com> Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Port TextInput/TextEdit clipboard optimizations from QtQuick 2.0Andrew den Exter2012-11-234-15/+32
| | | | | | | | | | Don't check if the clipboard has content until necessary as the check can block for an extended period. Port of 3db5afa71443533eee6825a5fb0da29498f96b94 from qtdeclarative. Change-Id: I606af79cbf10b147aa1bb6c182b0a84aabbc5257 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* make use of qml1_plugin.prfOswald Buddenhagen2012-11-227-74/+10
| | | | | | Change-Id: I0d0147592e981ef5c6543d50aa5c2cb355268553 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Remove references to QApplication::type()J-P Nurmi2012-11-223-5/+5
| | | | | | | | Qt3 legacy QCoreApplication::Type and QApplication::type() will be removed -> use qobject_cast instead. Change-Id: If95a5552440ace2592332de03f9d2240fa8770b9 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix building of examples.Friedemann Kleint2012-11-2225-5/+110
| | | | | | | | | | - Correct install paths. - Add missing subdir-.pro files. - Add missing resources. Task-number: QTBUG-27977 Change-Id: Ia8293cbaa7b32280181f41bde5b6e517989571f8 Reviewed-by: hjk <qthjk@ovi.com>
* Fix syncqt-warnings about missing QT_BEGIN_HEADER/NAMESPACE.Friedemann Kleint2012-11-211-0/+8
| | | | | Change-Id: I42532f6896ff9fe91084e2e1c8aa53a00527329b Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
* Fix Snake demoAlan Alpert2012-11-201-1/+1
| | | | | | | | | The runtime object is only exposed by qmlviewer. As the demo was changed to run from an executable instead, it no longer has access to this variable. Change-Id: I329342ac8f49c52331f9558111cb192e08bd89da Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Move the Qt Quick 1 imports back to "imports"Thiago Macieira2012-11-196-6/+6
| | | | | | | | | | The Qt Quick 2 ones will be in a different place. This restores Qt 4 behaviour. Change-Id: I6bc11113c0c89f4b11422b7fe98571930eb852cd Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007011.html Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Examples: Removed Symbian and MeeGo examples.Jerome Pasion2012-11-13240-15694/+0
| | | | | | | | Those platforms are not in scope for Qt 5.0 Change-Id: I70ee233ddfea3d15dc8a3e7d6cc6b1b43f1c7ba6 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Separate qtquick1 example install paths from qtdeclarative examplesv5.0.0-beta2Topi Reinio2012-11-0582-98/+98
| | | | | | | | | | | | | | After QtQuick1 -> QtDeclarative name change (79fed875), the examples both in qtquick1 and qtdeclarative use the same install path, causing conflicts. This change restores the install path used by qtquick1 examples as its own subdirectory under QT_INSTALL_EXAMPLES. Task-number: QTBUG-27823 Change-Id: Ica9ab8c5984642ace934e694cba346bcd3a1cb4c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Updated QmlApplicationViewer for QtQuick1 examplesTopi Reinio2012-11-055-176/+164
| | | | | | | | | | | | | | | - Copy the latest QmlApplicationViewer from qt-creator (4eedda04) - Include deployment.pri in qmlapplicationviewer.pri - Reorganize deployment.pri so that INSTALLS is generated for all plaforms (No INSTALLS was generated for non-unix platforms) - Remove Symbian-specific remnants (CAPABILITY, EPOCHEAPSIZE) Task-number: QTBUG-26197 Change-Id: I329342ac8f49c52331f9558111cb192e08bd89d4 Reviewed-by: Leonard Lee <leonard.lee@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* follow qt_tool.prf now setting up DESTDIROswald Buddenhagen2012-11-021-1/+0
| | | | | Change-Id: I875fb9563af10f51bb3d51950bc376f44a8f38db Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-026-50/+9
| | | | | | | | | DESTDIR and INSTALLS+=target are set up automatically now, but PLUGIN_TYPE needs to be defined. some other setup can be skipped as well. Change-Id: If6e77a42a571e1977875b13bc8519a2cd43df16a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* CMake: Remove obsolete test_modules testStephen Kelly2012-11-013-75/+0
| | | | | | | The generated module_includes test is a super-set of this test. Change-Id: I9faca7c8eb171c99e2033aa7cddc923aedf13507 Reviewed-by: Rohan McGovern [inactive] <rohan.mcgovern@nokia.com>
* CMake: Test module includesStephen Kelly2012-10-311-0/+6
| | | | | Change-Id: Ie02cabb3081be394242f8d1fa06ecf7946c4bdc0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 03:02:54 +0000