summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge v5.1.0 releasebaserock/morphRichard Dale2013-07-041-1/+1
|\
| * Only build QML examples if the QtQuick module is availablev5.1.0-rc2v5.1.0-rc1v5.1.0Andras Becsi2013-06-041-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-31255 Change-Id: If0b46400416c82858bca509903ef711b9fb250ea Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | dd qtwebkit-examples.morph to build the chunkRichard Dale2013-05-301-0/+13
|/
* sync.profile: Point dependencies to an empty stringSergio Ahumada2013-05-261-8/+9
| | | | | | | | | | | This means that we are going to use the same branch name for the dependencies as the branch of the repository under test. If we are testing the 'stable' branch, all dependencies will point to the 'stable' branch as well. Change-Id: I71e26192238cfd548a4f766d1fe469e390eea2a5 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Add changes-5.1.0 fileSergio Ahumada2013-05-141-0/+22
| | | | | | Change-Id: I90cf290d4dd630218fe8ef11f9e3e6b5d03e545e Reviewed-by: Iikka Eklund <iikka.eklund@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QML Examples: Remove .qmlproject filesv5.1.0-beta1Kai Koehne2013-05-072-32/+0
| | | | | | | | | The examples use qrc nowadays, so you can't launch them via qmlscene. Avoid confusion by only offering the .pro file. Change-Id: I6f9b3d1246e62172969a34840ab6c550899d2583 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix typo in docsKai Koehne2013-05-071-1/+1
| | | | | Change-Id: I7cda7d37cdeec52ded3256e62e31a1e95c8b9c43 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Rename QtWebKit Examples and Demos -> QtWebKit ExamplesSergio Ahumada2013-05-032-3/+3
| | | | | | | | | The repository has changed its name, so updating the documentation accordingly. Change-Id: I852c5a632a830c56ae7e2df576ee45af91e61e3d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* adjust to module renameOswald Buddenhagen2013-04-301-0/+0
| | | | Change-Id: Ib7a57a79760cd878dcaaf31de872c756fb6b63b9
* use qt_parts.prfOswald Buddenhagen2013-04-261-2/+3
| | | | | | | this makes "configure -nomake examples" apply to this repo as well. Change-Id: I64ee4fd67b9babf533fcfcfc022e9df085ac57de Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Bump MODULE_VERSION to 5.1.0v5.1.0-alpha1Sergio Ahumada2013-03-251-1/+1
| | | | | Change-Id: I61ad349fc3ebd49fba3bc3b5ddc12df2e42ac8c7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix the build of the QML examples if C++11 is enabledAndras Becsi2013-03-251-1/+1
| | | | | | | | | | | | The build fails with the following error message: unable to find string literal operator 'operator"" QWEBKIT_EXAMPLE_NAME' Add spaces around the define so that it is not interpreted as an operator expression. Change-Id: I0bdb10ab844441c280a1bd6ffaf75e0e2604f9da Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* The QT_NO_PRINTER guard is too generic if QPrintDialog is disabledAndras Becsi2013-03-251-2/+2
| | | | | | | | | | | Use QT_NO_PRINTDIALOG and QT_NO_PRINTPREVIEWDIALOG instead of QT_NO_PRINTER to guard QPrintDialog and QPrintPreviewDialog respectively to fix the build if printing is enabled but dialogs are not. Change-Id: I7c083c32b1ff0d2ea0793873533d184c067f01cd Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Merge "Merge branch 'dev' into stable" into refs/staging/stableSergio Ahumada2013-03-241-3/+0
|\
| * Merge branch 'dev' into stableSergio Ahumada2013-03-191-3/+0
| |\ | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I23e1f8d68c66460c83e2a42007f24aa96d4032fd
| | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-2511-21/+48
| | |\ | | |/ | |/| | | | Change-Id: Icf1cea987daf0b5b9a69823a16416ad6a5cf4a6c
| | * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-6/+6
| | |\ | | | | | | | | | | | | Change-Id: I9eb2b6ff75a71d8bd0bf8514b76dba68ec1c145f
| | * \ Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-052-31/+2
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I97a3851c17a6aa854679f9244684feeb2ef49a79
| | * | | Remove QT_{BEGIN,END}_HEADER macro usageSergio Ahumada2013-01-281-3/+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: Ia56e3e51a64ed5febf9330b6996e2223e7117ebb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17239-261/+1808
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: sync.profile Change-Id: Ib872687957e2de85267a0415209a58a733c41c24
| | * | | | sync.profile: Point dependencies to 'refs/heads/dev'Sergio 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: If62f887a8e561832d6cf5208599221ece7760c02 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | | | | Namespace jQuery to avoid potentional conflictsJonathan Liu2013-03-241-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fancy browser example loads jQuery but web pages may already load their own jQuery which may conflict. Task-number: QTBUG-28959 Change-Id: I6868764012f36d72362010d3e0a77ba0320f24ba Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | | | | Merge remote-tracking branch 'origin/release' into stableOswald Buddenhagen2013-03-224-1/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Change-Id: I6cfd392417a05f3e4877e29c1843a4ff004923aa
| * | | | | build with -no-widgetsv5.0.2Oswald Buddenhagen2013-03-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd2ef43fbecc26b39fddecba4927acd6585acf79 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | | | | disable the module when webkit is missingOswald Buddenhagen2013-03-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | webkit may exclude itself from compilation. Change-Id: Icd15ddf1025bf8a29221c1d3f9a14ae190dbe5d8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | | | | Add changes-5.0.2 fileSergio Ahumada2013-03-201-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7105fd60f24785744b2c0ad0970541cc501afeae Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| * | | | | define MODULE_VERSIONOswald Buddenhagen2013-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-29838 Change-Id: Ib5dd58a76e866781aef29976409a6c003d30c3dc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * | | | | Merge branch 'stable' into releaseJohanna Aijala2013-02-2112-27/+54
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Change-Id: I7860ca6ccaafa79ca192847ae82b3c2167b53aa0
* | | | | | Package resources for webkit qml examples in resource files.Michael Brüning2013-02-1911-21/+48
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds qrc files for the two webkit qml examples and a shared one to package shared resources. Depends on the fix for https://bugs.webkit.org/show_bug.cgi?id=107031 being merged to the Qt WebKit module. Task-number: QTWEBKIT-388 Change-Id: If02b6cfe72acd9b3d2a09b525b035646d1538dc7 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | | | | substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-6/+6
| |_|_|/ |/| | | | | | | | | | | | | | | Change-Id: I15a2d228996bc87e4a25436715c0cefabbb15faf Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | | Merge branch 'release' into stableSergio Ahumada2013-01-312-31/+2
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | Change-Id: I0ff240135fb13ed08f99eb1d2a7641210875feb4
| * | Update changes file for 5.0.1 releasev5.0.1Sergio Ahumada2013-01-211-30/+1
| | | | | | | | | | | | | | | Change-Id: Ic78f330965f400ce0f52008f56ed08999d33e9a8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | Change-Id: If229efadb30d97462e08f22c8f4a3dc0684f3685 Reviewed-by: hjk <qthjk@ovi.com>
| * | Merge branch 'stable' into releaseSergio Ahumada2013-01-09128-130/+184
| |\ \ | |/ / |/| | | | | Change-Id: I6c60690cd3e19afc20b31de9f89da84f5535fbb0
* | | make use of qtHaveModule()Oswald Buddenhagen2013-01-081-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I126131f75938b034e8e9130f0bf1ac27d2eeac8a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
* | | Update copyright year in Digia's license headersSergio Ahumada2013-01-07124-124/+124
| | | | | | | | | | | | | | | | | | Change-Id: I08bbc366f34784f5dbc0fa38d7cef33189edd1cf Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Add changes-5.0.1 fileSergio Ahumada2013-01-031-0/+51
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-26065 Change-Id: Iad321dc49d859b44a4491160f5ebf3d6c96dcdb9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Bump Qt version to 5.0.1Sergio Ahumada2013-01-021-4/+4
| | | | | | | | | | | | | | | Change-Id: I4af98610230b4fd1853fa300a12835d876dcb459 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Add qmake generated files to .gitignore.Miikka Heikkinen2012-12-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add source files generated by qmake for automatic static plugin imports to .gitignore. Change-Id: I834968d8b3e7c06f503f889c3029599de4fac6a3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Compile in C++11 mode: spaces between string literal concatenationsThiago Macieira2012-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Or we get the error: main.cpp:46:118: error: unable to find string literal operator 'operator"" QWEBKIT_EXAMPLE_NAME' Change-Id: Ic13fa250329f18f9b847468764bd00258df34c7d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * | point dependencies to 'release' branchesSergio Ahumada2012-12-181-8/+8
|/ / | | | | | | | | Change-Id: I473aac564e0fb971a0e95facf93a29005c6d4c0b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Doc: Fixed the \snippet paths in the example documentationv5.0.0Venugopal Shivashankar2012-12-179-76/+77
| | | | | | | | | | | | | | | | | | The \snippet paths in the WebKit widget example documents now reflect the new directory structure of the examples. Task-number: QTBUG-27515 Change-Id: I6153f7728cc6217a38a62bb04a7bfe3794823e2a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Removed the unnecessary nodes in the treeVenugopal Shivashankar2012-12-171-0/+5
| | | | | | | | | | | | | | | | | | | | This change should list only the example overviews under Qt WebKit Examples tree when viewed in Qt Creator. Task-number: QTBUG-28646 Change-Id: I6d959370046a0625cace6ff7c4e3dffce767c266 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-161-1/+0
| | | | | | | | | | | | | | qt is already added by spec_pre.prf, warn_on by default_pre.prf. Change-Id: Ie589814198d928df25bf4b203c3bd6ae04aefea4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Doc: Removed hyphen from the names.Jerome Pasion2012-12-131-16/+5
| | | | | | | | | | | | | | | | | | | | -consistent with other naming schemes and easy to predict across qdocconf files. -fixes cross-linking issues among Qt WebKit related documentation. Task-number: QTBUG-27646 Change-Id: I6e0f7e3a0d6efbe0d80b4e83e4b3b2c3ab421cb3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Add missing image to wheel scroller exampleSimon Hausmann2012-12-132-0/+2
| | | | | | | | | | | | Change-Id: Ia5831a59e7986fa7b4f14e0baebf287a26edb1fb Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | Fix webkit example manifest generation.Eike Ziller2012-12-1313-14/+13
| | | | | | | | | | | | Change-Id: Ia23f65e754932955f86276f5c2ff901de75ca4a0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* | Doc: Fixed a broken link to the Qt WebKit module pageVenugopal Shivashankar2012-12-121-1/+1
| | | | | | | | | | | | | | Removed the unnecessary \l command against an \sa command Change-Id: Ifb05b939b0cccec3122284aae1669b36afd76391 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Added documentation for the WebKit Widget examplesVenugopal Shivashankar2012-12-1222-7/+921
| | | | | | | | | | | | | | | | | | | | - Moved the qdoc files from the qtdoc repository - Added group pages for QML and QWidget-based examples - Added an index page - Updated the qhp details in the qdocconf Change-Id: I5f79fb1aedbfc3bcb42c84ac774ea1c4bd3a9036 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Added a missing delimiter for exampledirsv5.0.0-rc2Venugopal Shivashankar2012-12-121-1/+1
| | | | | | | | | | Change-Id: I28ff2012edc2ac86c515ec529fa272d11acb0624 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
View Lorry Controller Status