summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-111-2/+1
|\ | | | | | | Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
| * Revert "Dynamic GL support in Quick1's ShaderEffectSource"Laszlo Agocs2014-03-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | Will need to change to QOpenGLContext::currentContext()->isES() once the qtbase changes are in. This reverts commit 3eeaf987123f73ad7a4745745d9e7c70f30942cd. Change-Id: I7ac8718bc07cbcbaefe1633856722ae402078112 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-241-1/+2
|\| | | | | | | Change-Id: Ia3d0ffbe6ba6c8c34ec1ca2961953797d82ce282
| * Dynamic GL support in Quick1's ShaderEffectSourcev5.3.0-alpha1Laszlo Agocs2014-02-201-1/+2
| | | | | | | | | | | | | | | | | | | | Not strictly necessary but it is better not to call glEnable() with values that are not supported by GLES2. This way the error state will not polluted by an invalid_enum or similar. Change-Id: I952273f1814d9f124e5c4baa6196386645202439 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | whitespace fixesOswald Buddenhagen2014-02-201-1/+1
|/ | | | | | | | remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-042-7/+7
| | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: Id7ba78038c8504d960172923026245d28de182e8 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fix warnings found by clang: unused private membersThiago Macieira2013-06-101-0/+2
| | | | | | | | | | | | | | | | | | For qdeclarativebinding_p.h, since the class is private, there is no BC guarantee, so we can just remove the members. This class has a friend, but the friend is also in the same .cpp. qdeclarativebinding_p.h:139:14: error: private field 'm_object' is not used [-Werror,-Wunused-private-field] qdeclarativebinding_p.h:140:9: error: private field 'm_index' is not used [-Werror,-Wunused-private-field] For QSGGeometry, since this is a public class, we can't remove the members. Just make them unused. qsggeometry.h:124:11: error: private field 'm_reserved_pointer' is not used [-Werror,-Wunused-private-field] qsggeometry.h:127:10: error: private field 'm_reserved_bits' is not used [-Werror,-Wunused-private-field] Change-Id: Ia3650f38f32bd4cd705078a69c5445c64883bce4 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Update all plugins.qmltypes files except webviewLiang Qi2013-05-272-2/+27
| | | | | | Task-number: QTBUG-31388 Change-Id: I16a137190c6a1ddba196b0624ade67c1e7fd9eed Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-251-2/+2
|\ | | | | | | Change-Id: I71384165752875c073dfbcbd279cfdc82eeea4dc
| * 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>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-2/+2
|\| | | | | | | Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
| * make use of qtHaveModule()Oswald Buddenhagen2013-01-281-2/+2
| | | | | | | | | | | | Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-289-36/+0
|/ | | | | | | | | | The macro was made empty in qtbase/ba3dc5f3b56d1fab6fe37fe7ae08096d7dc68bcb and is no longer necessary or used. Discussed-on: http://lists.qt-project.org/pipermail/development/2013-January/009284.html Change-Id: Ic5b55b26967d65b3f11cac6fc3963f33ec6051a4 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-1025-25/+25
| | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QtQuick1: Add generated .qmltypesKai Koehne2012-11-298-1/+4374
| | | | | Change-Id: I4970676013d374db528c693375dd9ba2a3108908 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* 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>
* make use of qml1_plugin.prfOswald Buddenhagen2012-11-226-70/+10
| | | | | | Change-Id: I0d0147592e981ef5c6543d50aa5c2cb355268553 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Move the Qt Quick 1 imports back to "imports"Thiago Macieira2012-11-195-5/+5
| | | | | | | | | | 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>
* 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>
* 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-1712-24/+24
| | | | | | | | | | | | | | | | | 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>
* 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-2425-586/+586
| | | | | | | | | 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-187-49/+1
| | | | | Change-Id: Iad770614f7c1c890febeee662d0ce9370dcb17e3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-306-9/+18
| | | | | | | | -\qmlclass is now \qmltype -\instantiates is for QML types implemented in C++ Change-Id: I017822524de1879d272d777ec7681f4233128b01 Reviewed-by: Alan Alpert <alan.alpert@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>
* 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>
* Separate the path for Qt Quick 1 plugins from Qt Quick 2Lars Knoll2012-06-124-4/+4
| | | | | | | | | | | | 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>
* QtQuick1: Fix build warnings.Friedemann Kleint2012-05-101-0/+1
| | | | | | | | - Add missing .json file. - Fix warnings about unused variables, deprecated cast from char*. Change-Id: Ibb5065e604460ff945b3e452b2270d2b7368ea49 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QAbstractItemModel::setRoleNames is not necessary.Thiago Macieira2012-05-073-7/+11
| | | | | | | We have a proper virtual in Qt 5 now, so use it. Change-Id: Ieff72a7cb6feb17282f600d8d21e3f4fbe1914a4 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QtQuick1: Fix deprecation warnings.Friedemann Kleint2012-05-021-3/+5
| | | | | | | Introduced by qtbase:0df1c9f1fa04c06d6105de3f312c6c752a58ad70 Change-Id: I61e330707a49efd09bad0efda386712fba207c8a Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Adapt to Qt5 meta-object changesKent Hansen2012-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | QMetaMethod::signature() has been renamed to methodSignature(), and returns a QByteArray, not const char *. Thew new function QMetaMethod::isValid() should be used to check whether a method is valid (it's a lot cheaper than calling signature()). Also use the new QMetaObject::checkConnectArgs() overload that takes QMetaMethods, not strings, as arguments. Further improvements can be made by using the new functions QMetaMethod::name(), parameterCount() and parameterTypes(), but that will be done in separate commits. Change-Id: I3e4cfbdc7799d8bce747ef37f07d0d097370e409 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Remove the usage of deprecated qdoc macros.Casper van Donderen2012-03-135-58/+58
| | | | | | | | | | QDoc now has support for Doxygen style commands for italics, bold and list items. This change applies that change in QDoc to the actual documentation. Task-number: QTBUG-24578 Change-Id: Iae34eb8f2233dd9dbec79e7ab3c324f3f505b4cc Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* Use new plugin system in QtQuick1.Friedemann Kleint2012-02-2112-13/+18
| | | | | | | | - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I157206ad883be16fb85b9b6bffca7200532561e4 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Install import qmldir files to correct locationMatthew Vogt2012-02-091-1/+1
| | | | | Change-Id: I7d8999897f367726d2b254d5f1c127cc3fd65fc4 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix license header format.Matthew Vogt2012-02-0722-44/+22
| | | | | Change-Id: Ib71237ed181d075329a0267b5c108e6534c13e4e Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Install QtQuick1 imports to the correct locationSean Harmer2012-02-071-1/+1
| | | | | | Change-Id: I61597e008f34424ff3fc4254ca5e2e00bd638260 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* QtQuick1: Fix compilation on Windows.Friedemann Kleint2012-02-071-1/+1
| | | | | | | | - Add missing modules, includes. - Fix warnings. Change-Id: I21a6107db6c5978ccfd59c4202cf31e3deba19ca Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix license headers to match conventions.Matthew Vogt2012-02-0722-0/+22
| | | | | | | | Files updated to mtach licensing conventions for different types, and license text updated to match current. Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Install binaries and imports to qtbase.Andrew den Exter2012-02-034-4/+4
| | | | | | | Use the Qt.quick1.* variables to determine the DESTDIR. Change-Id: I17b6d1f037b76ed25a005ec56cbc5c82b522ffc6 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
* Modify QtQuick1 to build in Qt5Matthew Vogt2012-01-3112-15/+15
| | | | | Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Import relevant source from Qt 4.8Matthew Vogt2012-01-3032-0/+5686
Change-Id: I5078db4081d95290c54f39d3c0efc2fc2f62e6a6
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 10:08:26 +0000