summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* sync.profile: Point dependencies to 'refs/heads/dev'wip/androidSergio Ahumada2012-12-131-8/+8
| | | | | | | | | | | We should test dev branches against dev branches only by default. At some point we should automate the merges from release->stable->dev and/or decide how to handle possible conflicts. This is good enough for the time being. Change-Id: I15717ed1666bf939ddbe15c20df1858f480d60b7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add a method that allows registration of files to typesAlan Alpert2012-12-059-1/+143
| | | | | | | | | | There is currently no way in C++ to duplicate the functionality of a qmldir file in mapping QML files to versioned types in a module. This functionality would be useful both in cases where a separate qmldir file would be overkill, and for cases where the type mapping should be generated dynamically. Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288eab Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Delay loading implicit importAlan Alpert2012-12-056-36/+98
| | | | | | | | | | | As a performance improvement to avoid accessing the filesystem unecessarily, only import "." implicitly if types cannot be found in the existing imports. This is not a behavior change for type resolution, because "." already has the lowest precedence for type resolution. Change-Id: I8a8f10f7a790e6a02fc2c07c443f7be1984fc979 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* 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>
* Fix crash in GridViewThomas Hartmann2012-10-231-1/+1
| | | | | | | | | | QDeclarativeGridView crashed in the WelcomeScreen of Qt Creator. For details refer to the task. Task-number: QTBUG-23445 Change-Id: I44594a253a004db254e8cd87560de3f0824a94bf Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Fix QDeclarativeTextInput::moveCursorSelection()Konstantin Ritt2012-10-203-42/+44
| | | | | | | | | | | | by using fixed QTextBoundaryFinder behavior. Update QDeclarativeTextInput autotests. Task-number: QTBUG-11365 Task-number: QTBUG-27364 Change-Id: Idda22f6c0974bf29d2ff961ea8d998a68c3d676b Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Adapt to WebKit module changesSimon Hausmann2012-10-193-4/+4
| | | | | | | | QtQuick1 uses the Widgets related API of QtWebKit and hence needs to use the QtWebKitWidgets module. Change-Id: Idf2e65d053e1dbf2501486c8f0a22b8b25f23efc Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Change the header message: this is now the QtDeclarative moduleThiago Macieira2012-10-19322-322/+322
| | | | | Change-Id: I18a370a58494049939d035f1c3528406f3f7645f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Revert "Temporarily disable WebKit as build dependency for QtQuick1"Simon Hausmann2012-10-191-1/+1
| | | | | | | | | This reverts commit 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 WebKit should be fixed now and this was supposed to be a temporary move only. Change-Id: I1e3adb55ed5b98e437b45cbc9c6f7e7f9eeb85a9 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Change qtdeclartive tst_examples autotest to use qWaitForWindowExposed.Janne Anttila2012-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The QtDeclartive tst_examples autotest has been flaky. After some investigation I found that it has been using qWaitForWindowActive, which basically means that window itself or it's child has taken focus. When running tst_examples locally I found that some tested QML files stay on screen for maximum time given for qWaitForWindowActive. This probably happens because not all QML demos take focus. From Git logs I also found that test case intially used qWaitForWindowShown (15e48b7387ae302a1b07a57b8374b097dc9c96a4), but that was changed to qWaitForWindowActive when qWaitForWindowShown was deprecated. Based on documentation qWaitForWindowExposed should be used instead of qWaitForWindowShown. --> Switch qWaitForWindowActive to qWaitForWindowExposed to decrease execution time of tst_examples in CI system and make tests to pass more consistently. Change-Id: Id859b377e577c44e85216a5acb51e69fe9659699 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Do not use an export macro in the function definitionThiago Macieira2012-10-171-1/+1
| | | | | | | | | | qmlExecuteDeferred is exported using Q_DECLARATIVE_EXPORT in qdeclarative.h, so we don't need to use one here. Better not have any than have the wrong one, which can cause problems. Change-Id: I672f8aaf0fef2600a6ab8c4a17112404fc5b1cda Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Increase the timeout for the example window to 3s (up from 1)Thiago Macieira2012-10-171-1/+1
| | | | | | | | The examples test is failing on different tests every time, so it's likely to be a timing issue. Change-Id: I3fc8826d1100dba8e62839eb7f8d67b5bda3b761 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* QtQuick1: Make the examples test for QtQuick1 pass.Friedemann Kleint2012-10-177-35/+85
| | | | | | | | | | | | | | | | | | | | | | | | - Fix check to indicate immediate errors, skip the loading state and check for errors after loading again. - Exclude all broken examples. - Exclude Mac .app folders - Fix the DeclarativeViewer to check for the presence of the ImageMagick and ffmpeg executables only once, reducing test time. - Do not check for ImageMagick by running its command line tool 'convert' on Windows, since Windows has a tool of the same name that converts file systems (!). - Fix doc snippets to load correctly. - Introduce defines in case WebKit or XmlPatterns are not present (which existed in Qt 4). Task-number: QTQAINFRA-428 Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36 Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Do not use module-include in shader-plugin.Friedemann Kleint2012-10-176-7/+10
| | | | | | | | Task-number: QTBUG-27471 Change-Id: I4f15e7358739ac6057798505af5ea4c171207f20 Reviewed-by: Peter Kümmel <syntheticpp@gmx.net> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* QtQuick1: Fix qmlviewer no longer showing file dialog.Friedemann Kleint2012-10-171-6/+4
| | | | | Change-Id: I81588fbe7141fb1df0d56b2dec2e8d495af975a0 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* QtQuick1: Introduce messages to some tests.Friedemann Kleint2012-10-172-8/+19
| | | | | Change-Id: If95a85c8aaff359a35ae21549f0142e47cb0cc10 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-17387-743/+743
| | | | | | | | | | | | | | | | | Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Temporarily disable WebKit as build dependency for QtQuick1Simon Hausmann2012-10-171-1/+1
| | | | | | | | | The CI system is having trouble building WebKit and in the meantime let's build this module without to allow for the integration of unrelated changes. Change-Id: Ifbdf59863c8bc42b5912e2631649b68649254893 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QPerformanceTimer: fixed wrong implementation of elapsedToAbsoluteTime()Frantisek Vacek2012-10-131-4/+6
| | | | | | | | Function elapsedToAbsoluteTime() had wrong implementation on MAC and WIN platforms. Change-Id: Icc11e85bcd562cce42af902749883b433a1fcb0b Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Fix quick1_debug -> declarative_debugSergio Ahumada2012-10-134-4/+4
| | | | | | | This change was introduced in qtbase by abbecca7d484560111dfdbb894d48d253873018b Change-Id: Ic04076e0925c8e2a7226caef4a008fd09a9d1216 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 01:50:02 +0000