summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Remove Symbian platformKai Koehne2012-09-1816-172/+5
| | | | | Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* centralize load(qt_build_config)s in .qmake.confOswald Buddenhagen2012-09-111-2/+0
| | | | | Change-Id: I627dfef54743821d0c3019034f114ac4d81fda76 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Compile without xmlpatterns again.Daniel Molkentin2012-09-051-0/+1
| | | | | Change-Id: I1cb9d92c60e8595432c1a13866c370e040553a6f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Register Qt 4.7 import on-demand, instead of at startup.Robin Burchell2012-09-039-73/+124
| | | | | | | | | | | | | | | | | | | | This is a slightly less awkward approach (keeps backwards-compatibility) while speeding up startup for applications that don't use the old import path. Also prints a warning to let developers know they should migrate their code when possible. Completely disabling the Qt 4.7 import is still possible by setting QT_NO_IMPORT_QT47_QML. This takes around 10-15ms off a very simple "hello world" on my macbook. As an added bonus, forward-port a similar approach to 4.8's a26f545d8e25af74fb43d16c9afa79f6e04463e7 and don't register graphical types in a non-graphical application as someone (very naughtily) apparently forgot to get it integrated to Qt 5 first. Change-Id: I7821523750b3ab6770f367788725d0da70c5ec1f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Alan Alpert <416365416c@gmail.com>
* Remove the user of the QWidgetStar metatypeid.Stephen Kelly2012-08-152-4/+0
| | | | | | | | It is to be removed, and is obsoleted by QMetaType::PointerToQObject. Change-Id: I6832808cfd1e22d6c04c7ba37bf52ff7c36f0272 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Use qtxmlpatterns only if it is availableYuchen Deng2012-08-141-1/+1
| | | | | Change-Id: I6a84f8b35f26fbe44b51ecf4f38aa2619996e83a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make use of QT_PRIVATE to specify private Qt dependenciesOswald Buddenhagen2012-08-141-3/+1
| | | | | Change-Id: Ia65d09d850a58e66db2d6d2a25703725283dbdb8 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* follow rename of qt_module_config.prf to qt_module.prfOswald Buddenhagen2012-08-141-1/+1
| | | | | Change-Id: I1d1be313492c311aaaf6a87dd96d56d08feb097e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix compilation of missed network dependYuchen Deng2012-08-031-1/+1
| | | | | | | | qtquick1/src/declarative/qml/qdeclarativeengine.cpp:78:25: fatal error: QNetworkReply: No such file or directory Change-Id: If39be538bd135118d6654e154e86e8a082f03a58 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Do not assume ordering of resources declared for the default propertyMatthew Vogt2012-08-032-0/+17
| | | | | | | | | The order in which resources declared in QML are placed into the default property is not defined, and should not be relied upon. Task-number: QTBUG-26702 Change-Id: I5023b8dad89513cde69852e0c3a910477f60888e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Compile fix for QWindowSystemInterface and QGraphicsObjectMatthew Vogt2012-08-031-2/+2
| | | | | | | | | Adapt to changes in qtbase - removal of third parameter to the QGraphicsObject ctor, and the declaration of the QWindowSystemInterface class. Change-Id: I8b01ae67f09cbf4fc2e3e062dc8b976ccb061234 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix install path of folderlistmodel particles and shader import pluginsAndrew den Exter2012-08-011-1/+0
| | | | | | | | | | | | | | 19bba2faca1e1a1e6ddbb7a899a6894fc64c1723 added QtQuick1 to both the base path of QtQuick 1 imports and the target paths of individual plugins leading to a duplication of QtQuick1 in the final path. Remove the suffix from the root destination directory as the plugins still need to explicity include it in the install path and it's better if there's a single relative target path used in the .pro files. Task-number: QTBUG-26707 QTBUG-26701 Change-Id: I79ee28fc5b6ef549cf3c5f71585756149f0f8ff3 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* QDeclarativeView-plugin: Fix include of the QDeclarativeView widget.Friedemann Kleint2012-07-301-1/+1
| | | | | | | | Task-number: QTBUG-25196 Change-Id: Ibdd3053768972a98374cf22c5749448008f303ae Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-3050-94/+188
| | | | | | | | -\qmlclass is now \qmltype -\instantiates is for QML types implemented in C++ Change-Id: I017822524de1879d272d777ec7681f4233128b01 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* MouseArea: use current value of drag.axisAlberto Mardegan2012-07-272-11/+8
| | | | | | | | | | | | | If the drag.axis is changed while a drag operation is in progress, put it into action immediately. This allows, for example, start a dragging operation out of an item in a scrollable ListView to anywhere on the screen. See the linked bug number for an example. Task-number: QTBUG-26440 Change-Id: I4ffa71c08b97a767aec7f69d19271000a2631327 Reviewed-by: Rick Stockton <rickstockton@reno-computerhelp.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Remove obsolete use of Q_WS_QWS.Stephen Kelly2012-07-271-1/+1
| | | | | Change-Id: I0c2af5663852a1fa456684424c220697fa6824e8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* remove double-string-double conversion from QDeclarativeListModelFlorian Hänel2012-07-241-4/+7
| | | | | | | | | we do a double-string-double conversion in QDeclarativeListModel which introduces precision errors if that conversion is lossy, e.g. ecvt. is used Change-Id: Ie871ebbb04695f56fc7b49b9d788037da4a857c0 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
* Fix objectName test in tst_qdeclarativeecmascript.Glenn Watson2012-07-134-24/+2
| | | | | | | | | | | The QtQuick1 library relied on special case handling of the objectName property in qtbase. With Qt5, there is a normal notify signal for objectNameChanged. Remove the QtQuick1 special cases and fall through to the default code path. Task-number: QTBUG-26334 Change-Id: I70f31947b6c74c7125d6f99a33e9b02d7ef52273 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Use the new QT_STATIC macro from qglobal.hThiago Macieira2012-07-111-15/+5
| | | | | | | This simplifies the handling of static vs shared/DLL builds. Change-Id: I547df9bc1da3dd0dca4c621f46450328e47cab3c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* load plugins properly when QT_NO_SETTINGS is definedTasuku Suzuki2012-07-061-3/+0
| | | | | Change-Id: I9bc7a3ed70f866c59ba9f72ad3a96b22e6bbf7a6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Qml ListView highlight component cannot access ListView scopeMartin Jones2012-07-042-64/+48
| | | | | | | | | Use the component creationContext to create the highlight item. Also do this for the header and footer. Task-number: QTBUG-26043 Change-Id: I74276dfbcb4989b8e2b5acf1f2b16ed5537e24de Reviewed-by: Bea Lam <bea.lam@nokia.com>
* anchors.mirrored is documented but does not exist in QtQuick 1Martin Jones2012-06-291-4/+0
| | | | | | | | | anchors.mirrors was removed before QtQuick 1.1 release, but the docs were not removed. Task-number: QTBUG-23427 Change-Id: I8352a444b97a21a98228b85f12a652ed013e93f1 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Install the qmlgesturesplugin in the correct locationmarc_philippens2012-06-281-1/+1
| | | | | Change-Id: I8438bcc8166c1e34bd04b399a02f95d11b1c4d22 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Rename qmldbg_tcp plugin to avoid conflict with qtdeclarative's copyKent Hansen2012-06-286-5/+3
| | | | | | | | | | ... and compile the plugin regardless of whether qtdeclarative has been qmake'd. Change-Id: I704214e07a92eff6630d94858eb6898a399d6fa2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Item.mapFromItem() crashes with Items not created by the engine.Martin Jones2012-06-271-2/+4
| | | | | | | | | | Item.mapFromItem() and Item.mapToItem() get the script engine from the item they are called on. Safer to use the script value passed to the function to determine the engine being used. Task-number: QTBUG-26280 Change-Id: Id72afd723b21ed0f1a747e2d802d6f9715f6c093 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* build system cleanupsOswald Buddenhagen2012-06-261-7/+2
| | | | | | | | | | | | | | - load(qt_module) => load(qt_build_config) - remove: - CONFIG+=module (obsolete) - setup of PKGCONFIG* variables (automated now) - code relating to module version headers (automated now) - %mastercontent assignment (automated now) - QT_BUILD_*_LIB defines (automated now) - pointless QPRO_PWD assignments Change-Id: I4b3a1cd560e99658102d374fb278fe3e7744bae9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-261-3/+5
| | | | | Change-Id: Ia96fa9e0ba43de4c32053699d0e9528ef308fb67 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove QtSvg library use.Toby Tomkins2012-06-261-1/+0
| | | | | | | | | Changes in the build system causes the header of this library to be included incorrectly. This library was never a hard dependancy for qtquick1. Change-Id: If28d4fcd7879c04772158f1e03da6e05c6f21928 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Import QtQuick1 WebView from upstream WebKit trunkSimon Hausmann2012-06-256-0/+1606
| | | | | | | | | | | Move QtQuick1 WebView from WebKit trunk into this module. It only depends on public API and is otherwise self-contained. The files upstream are all copyright Nokia, hence the import here with according re-licensing. The plugin is not enabled by default yet. Change-Id: I3fce42d90e83edfaec59ff263e31bfe314f4377c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* QDeclarativeVisualDataModel crashes getting QAbstractItemModel roles.Martin Jones2012-06-221-2/+3
| | | | | | | | Don't iterate over a temporary. Task-number: QTBUG-26209 Change-Id: Iab99d0756c5c30e4f5bb9b674a20eaf76ebce1e6 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Include <QDataStream> properly where QDataStream is usedThiago Macieira2012-06-194-0/+4
| | | | | | | | | | | And add the missing forward-declaration to QMetaObject in one place. I guess no one noticed that QObject was actually fully-declared, despite the existing forward declaration. This was caused by qpair.h including qdatastream.h, which includes qiodevice.h, then qobject.h, then qobjectdefs.h. Change-Id: Idd3aef1acecf0c045a63c154c3ce2d7835afa71b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Finish the conversion from QWeakPointer back to QPointerThiago Macieira2012-06-198-18/+18
| | | | | | | | | Use QPointer to store classes derived from QObject that weren't initially shared with QSharedPointer. QWeakPointer must be used only with QSharedPointer. Change-Id: I28705055bb0167300fee2dee45a8f05cc8f818f3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Wrong signals received when moving Flickable elementKatja2012-06-161-2/+2
| | | | | | | | | | Both onMovingHorizontallyChanged and onMovingVerticallyChanged received when Flickable element moved only to one direction. Fixed so that only relevant signal sent. Task-Id: QTBUG-25042 Change-Id: I20acb2403e08c2afa681da2e553cea227c91f001 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* QtQuick1: Fix warnings about QWeakPointer usage.Friedemann Kleint2012-06-134-11/+12
| | | | | | | | - Use getPointer to get a weak pointer for the binding. - Change QWeakPointer<QObject> to a QPointer. Change-Id: I6c362a51c398f73817b5f4545d21f4845d625e13 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Separate the path for Qt Quick 1 plugins from Qt Quick 2Lars Knoll2012-06-125-5/+5
| | | | | | | | | | | | Install and load Qt Quick 1 plugins from imports/QtQuick1/... This is to avoid conflicts between Qt Quick 1 and 2 and cleanly spearate the plugins for both. Currently, e.g. the folderlistmodel exists for both, and gets installed into the same location. Change-Id: I55331a5a02148eacc3c615436d77eb97bf0fbd72 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Move the designer plugin from qttools hereLars Knoll2012-06-075-1/+225
| | | | | | | | | Like this the plugin is together with the functionality and thus automatically gets installed when the module gets installed. Change-Id: I01f9f61d46fb5ef11c5c8f474df8df59865e535c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QDeclarativeXmlHttpRequest - use readyread signal not downloadProgressShane Kearns2012-06-061-5/+4
| | | | | | | | | | | | | The readyRead signal (part of QIODevice base class) is the appropriate signal for knowing when there is data available in a QNetworkReply. DownloadProgress is intended for UI elements e.g. progress bars. Previously it was emitted at the same time, but now it is emitted less often. Task-number: QTBUG-20449 Change-Id: I732a2facb083f4cc35d01441a34964847f00fdb2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Remove the remaining traces of the old plugin systemLars Knoll2012-06-051-2/+2
| | | | | Change-Id: I0b4156f01d5d1bfe5cdde724148ed681025ab227 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 22:17:30 +0000