summaryrefslogtreecommitdiffstats
path: root/src/imports/webview
Commit message (Collapse)AuthorAgeFilesLines
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-041-1/+1
| | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: Id7ba78038c8504d960172923026245d28de182e8 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-281-4/+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-103-3/+3
| | | | | | 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-291-0/+0
| | | | | Change-Id: I4970676013d374db528c693375dd9ba2a3108908 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* make use of qml1_plugin.prfOswald Buddenhagen2012-11-221-8/+2
| | | | | | 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-191-1/+1
| | | | | | | | | | 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-191-1/+1
| | | | | | | | 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>
* Rename the QtQuick1 module back to QtDeclarativeFriedemann Kleint2012-10-171-2/+2
| | | | | | | | | | | | | | | | | 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-271-3/+3
| | | | | | | | 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-243-72/+72
| | | | | | | | | 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>
* Doc: Changed \qmlclass to \qmltype and added \instantiatesJerome Pasion2012-07-301-1/+2
| | | | | | | | -\qmlclass is now \qmltype -\instantiates is for QML types implemented in C++ Change-Id: I017822524de1879d272d777ec7681f4233128b01 Reviewed-by: Alan Alpert <alan.alpert@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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 00:59:26 +0000