summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fix namespace version to 5.0.1 for qhp documentationv5.0.1Sergio Ahumada2013-01-121-1/+1
| | | | | Change-Id: I995109869294f3106046a8fd8299b6300b4c567f Reviewed-by: hjk <qthjk@ovi.com>
* test examples only in developer buildsOswald Buddenhagen2013-01-111-1/+1
| | | | | | | | | we don't want to actually build examples in production builds any more, so the test is bound to fail. Change-Id: I5c936a5b193aa575a0193dcf0968cce9c20c505f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge branch 'stable' into releaseSergio Ahumada2013-01-0928-93/+195
|\ | | | | | | Change-Id: I1f4521205b6bb3811294fd2c32df4b4bce97d147
| * Fix image source for networkaccessmanagerfactory exampleTopi Reinio2013-01-071-1/+1
| | | | | | | | | | | | | | | | | | Change the image URL to point to an existing image. Task-number: QTBUG-28374 Change-Id: Ied1ea7911757b1098847cb074b71650f9cc44776 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * Improve tst_qdeclarativetextedit.Friedemann Kleint2013-01-072-60/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Base on QDeclarativeDataTest to locate test data. - Make small windows frameless to prevent errors from minimum size constraints of decorated windows on Windows. - Add test messages printing the value of comparisons. - Skip alignment tests if no reference image exists: Previously, the test would create an image file name "<testfile>-unknown-architecture", find out it does not exist, write out the 'actual' image under that name (clobbering the source directory) and compare to it, claiming success. The reference image name is now composed of platform and style name and the test is skipped if the file does not exist. Task-number: QTBUG-28611 Change-Id: If1496e11db9638e7febd3af637ad55d7c6f11409 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
| * Fix mistake in using == instead of =Thiago Macieira2013-01-041-1/+1
| | | | | | | | | | | | | | | | | | Found by clang: qml/qdeclarativexmlhttprequest.cpp:1324:24: error: equality comparison result unused [-Werror,-Wunused-comparison] Change-Id: Ie46678d6102f2e50bf87a53a9cbc14d114b4e334 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Fix some warnings in qtquick1 found by ClangThiago Macieira2013-01-045-7/+7
| | | | | | | | | | | | | | | | | | | | | | qml/qdeclarativevme.cpp:286:26: error: destination for this 'memset' call is a pointer to dynamic class 'QObject'; vtable pointer will be overwritten [-Werror,-Wdynamic-class-memaccess] qml/qdeclarativemetatype.cpp:441:9: error: expression result unused; should this cast be to 'void'? [-Werror,-Wunused-value] util/qdeclarativefontloader.cpp:87:52: error: addition of default argument on redeclaration makes this constructor a default constructor [-Werror,-Wdefault-arg-special-member] qmlplugindump/main.cpp:180:75: error: unused parameter 'engine' [-Werror,-Wunused-parameter] qml/qdeclarativefastproperties_p.h:53:1: error: class 'QMetaObject' was previously declared as a struct [-Werror,-Wmismatched-tags] Change-Id: I1e91252d048e36e684a854ca1c6eb92e5a871444 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Silence the Clang warning about overloaded virtual shadowing a previousThiago Macieira2013-01-041-0/+11
| | | | | | | | | | | | | | | | | | There are a couple virtuals that are being overridden intentionally. We can't raise the previous virtual because they are privates. So the only thing we can do is disable the warning. Change-Id: Ie9c02e5d5a02d35c4cd7712c554be6e5cf5523a7 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Add changes-5.0.1 fileSergio Ahumada2012-12-241-0/+51
| | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: Idbc97cdcb3f7d4117e82ad8c7f0c552a617a930b Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Bump Qt version to 5.0.1Sergio Ahumada2012-12-231-4/+4
| | | | | | | | | | Change-Id: I925fc622998c0ea7e8b045b70e0145a9bbd29459 Reviewed-by: Alan Alpert <aalpert@rim.com>
| * Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
| | | | | | | | | | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I9b80e83beb65041f7c6f79c0b2ad8c04f05343eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * QmlViewer: Fix test script exits.Friedemann Kleint2012-12-201-5/+19
| | | | | | | | | | | | | | | | | | | | | | Use exit code 1 on Windows to indicate failures as negative exit codes are reported as crashes by QProcess in the qmlvisual test. Always use QCoreApplication::exit() to ensure proper cleanup. Task-number: QTBUG-28611 Task-number: QTBUG-28735 Change-Id: I0b12153449f7371ce7795a5747e3311184bc7b6f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * QmlViewer: Display options on Windows using a non-proportional font.Friedemann Kleint2012-12-201-1/+3
| | | | | | | | | | Change-Id: I7006fdc73c459da0e19e08fbda35905f32f2aebc Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * remove pointless harfbuzz includeOswald Buddenhagen2012-12-191-1/+0
| | | | | | | | | | Change-Id: Ie2aa164eeb265a52a59da080f51e29aeaf77083b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-199-9/+9
| | | | | | | | | | | | | | qt is already added by spec_pre.prf. Change-Id: Ie2cf7c733718319437a823993c09778507c423ef Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Specify better increment for captured propertiesAlan Alpert2012-12-193-4/+4
| | | | | | | | | | | | | | | | There aren't that many captured properties, decreasing the increment will give better performance. Change-Id: Iddb17c695eda5513f2d038123f4c886e559d8f6a Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | point dependencies to 'release' branchesSergio Ahumada2012-12-181-8/+8
|/ | | | | | Change-Id: Id025dd987dc759941cc4022ee6814e8f599b562c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* test: Mark tst_qdeclarativetext as insignificantSergio Ahumada2012-12-181-0/+2
| | | | | | Task-number: QTBUG-21015 Change-Id: I5b0f3a607c182aec819bd525ce3b2a4f8b47791a Reviewed-by: Alan Alpert <aalpert@rim.com>
* Add minimal plugin importing to quick1 qmlplugindump toolv5.0.0Miikka Heikkinen2012-12-141-0/+2
| | | | | | | Task-number: QTBUG-28131 Change-Id: I9d38b7f2ec94dfd084e2ce23412c4a8348ffe7b4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 14:20:27 +0000