summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Copy builtins.qmltypes into the 'imports' directoryKai Koehne2013-02-201-2/+2
| | | | | | | | | | We used to copy builtins.qmltypes into qtbase/imports/QtQuick1, but install it into into $QT_INSTALL_IMPORTS. Unify this by copying it also directly into the imports directory. Change-Id: I9fe2feae4ff0da49d59d787b92ba2d7d4c47461d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-155-12/+14
| | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-6/+6
| | | | | Change-Id: Ic87c7fdecbe3c5431d38b228e186237ccd2aed3b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge branch 'release' into stableSergio Ahumada2013-01-311-1/+1
|\ | | | | | | Change-Id: Ied6e28f0e7e3dceccdbbe878dfab8f88c64e32d8
| * 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>
* | make use of qtHaveModule()Oswald Buddenhagen2013-01-284-5/+5
| | | | | | | | | | | | Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Doc: Remove duplicate consecutive wordsTopi Reinio2013-01-114-4/+4
| | | | | | | | | | | | | | | | | | Grepping through qdoc files, 'the the' appears in a few places. Also one instance of 'centre' replaced by 'center'. Change-Id: If978895c470ff02a0fe0c164aec421943deb24d3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* | Update copyright year in Digia's license headersSergio Ahumada2013-01-10662-664/+664
| | | | | | | | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Remove QPerformanceTimer now that QElapsedTimer contains the necessary bitsRobin Burchell2013-01-095-322/+12
|/ | | | | | | | | | | QPerformanceTimer was a copy of QElapsedTimer with some additional functionality which has since been subsumed into QElapsedTimer, so remove the forked code. (backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative) Change-Id: Ife1dac4d6c46404b43253680819da21350c65569 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.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-044-6/+6
| | | | | | | | | | | 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>
* Bump Qt version to 5.0.1Sergio Ahumada2012-12-231-4/+4
| | | | | Change-Id: I925fc622998c0ea7e8b045b70e0145a9bbd29459 Reviewed-by: Alan Alpert <aalpert@rim.com>
* remove pointless harfbuzz includeOswald Buddenhagen2012-12-191-1/+0
| | | | | Change-Id: Ie2aa164eeb265a52a59da080f51e29aeaf77083b 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>
* Backport PathView currentIndex fixes from Qt 5Bea Lam2012-12-121-37/+58
| | | | | | | | | | | | 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>
* Process imports in the order they appear in the code.Robin Burchell2012-12-121-8/+8
| | | | | | | | | | | | | | | 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>
* 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>
* Add qtdeclarative.qdocconf to get a example_manifest.xmlhjk2012-12-11555-1/+29548
| | | | | Change-Id: I52b87947559c10d3e60af81fe8d4f3189dd1614e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add PLUGIN_CLASS_NAME to qtquick1 pluginsMiikka Heikkinen2012-12-103-0/+3
| | | | | | | | Needed for automating static plugin loading. Task-number: QTBUG-28131 Change-Id: Ia32d3dad2136d0fda468a538fe9be989e72c79eb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@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>
* 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-012-2/+23
| | | | | | | | | | 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>
* 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>
* 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>
* QML file loading: honor synchronous requests made through QNAMAlan Alpert2012-11-282-8/+28
| | | | | | | | | | 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-272-2/+5
| | | | | | | | 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>
* Accept missing semicolon after do-while statement.Erik Verbruggen2012-11-266-802/+852
| | | | | | | | | | | 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 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>
* 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>
* adjust to qt_plugin.prf changesOswald Buddenhagen2012-11-024-36/+5
| | | | | | | | | 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>
* 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-201-4/+4
| | | | | | | | | | | | 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-192-2/+2
| | | | | | | | 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>
* 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>
* 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>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-17105-263/+263
| | | | | | | | | | | | | | | | | 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>
* 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>
* QDeclarativeTrace patch for a custom trace instanceFrantisek Vacek2012-09-285-4/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for the BB10 Cascades profiling. There are more reasons for introducing this patch: 1) Cascades do not use QtGui library for QML rendering. It has its own paint engine with client-server architecture. Profiler traces are sent asynchronously from non Qt renderer thread to the Qt client. The QPerformanceTimer has to be patched too, cause we need to know time difference between tracing zero time and some time in past, see: qint64 QPerformanceTimer::elapsed(qint64 to_monotonic_time_ns) const 2) Since we need more sophisticated trace engine in cascades, this patch allows explicitly assign custom class derived from QDeclaraqtiveDebugtrace to the trace framework. If no custom instance is assigned, the default QDeclarativeDebugTrace instance is created implicitly on first trace request. Using custom trace instance which is not part of Qt (it is part of libbbcascades) allows us to implement all Cascades trace special needs in libbbcascades and not to carry Qt with the platform specific code. 3) The NO_CUSTOM_DECLARATIVE_DEBUG_TRACE_INSTANCE macro is introduced to allow custom trace engine only on the bleckberry platform, see declarative.pro. If this macro is defined Qt compiles from its original code. 4) Possibility of custom QDeclaraqtiveDebugTrace instance might be usable for other projects which needs to extends somehow default Qt trace functionality. 5) Patch is not intended to be applied to Qt Quick 2, since declarative debugging infrastructure is changed there. Change-Id: I199211c1de66e930e252e8c033503d7f4940565f Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
* Add QtQuick1 WebKit integration (from QtWebKit module)Simon Hausmann2012-09-272-3/+4
| | | | | | | | This adds the QML1 QDeclarativeWebView integration to the default build (it was added a while ago) as well as the unit tests. Change-Id: I7324f5a3b00716d4b300e8c11d9ea3b8b9577da3 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-24392-9408/+9408
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I11a957e35758e821269478ebc91e87f0f5ebc4d5 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 20:38:44 +0000