summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
| * Add brief documentation for flickrview and youtubeviewAndras Becsi2012-12-116-5/+104
| | | | | | | | | | Change-Id: I69a01221019fa62215d1d3ec1e312c6ba138fd79 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
| * Re-add the webkit dependency for QML examples.Pierre Rossi2012-12-102-2/+2
| | | | | | | | | | | | | | | | | | | | removing the webkitwidgets dependency was right, but they still depend on webkit. My bad. Change-Id: Ie907ea0853198905dde6ab24b10e819f62f8d754 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| * Adjust webkit example project install targets.hjk2012-12-10213-139/+117
| | | | | | | | | | | | | | | | This follows suit with aeb036e in qtbase. Change-Id: Ifc85b327df81d15f3579b911e07c95a3b7a3bb9d Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * Correct paths for QtWebKit examples.Michael Brüning2012-12-104-35/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the examples do not show any source code in the documentation anymore. This is corrected by dropping the "webkit/" prefix in the paths used in the qdoc files of the examples: - Dom Traversal - Fancy Browser - Form Extractor - Previewer Task-number: QTBUG-28494 Change-Id: Ieedd4dcf210ec3f5551f918c1b1f5ad0b20fe704 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Add a qdocconf file for the webkit examples and demos module.Pierre Rossi2012-12-084-2/+34
| | | | | | | | | | | | | | | | | | | | | | This should help having at least a few documented examples for 5.0 and in Creator. Change-Id: I7b26d01cc26eb1a670029aac171d54980a775fac Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: hjk <qthjk@ovi.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * Add \brief comments to WebKit examples.hjk2012-12-074-4/+4
| | | | | | | | | | Change-Id: Ia50fed24f887ae6945ab8e911f6d6625b34df6d3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix FancyBrowser crash caused by recursion loops.Michael Brüning2012-12-061-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using jQuery iterators can cause recursion loops crash when converting the result set of the call to a QVariant because nextSibling, parentNode and previousSibling are all enumerable properties and hence get visited in the conversion to QVariantMap. The workaround is to append "; undefined" to the evaluated JavaScript to prevent that the whole iterator set is returned and converted. Task-number: QTBUG-28378 Change-Id: I92fb43ed823e34a9f68eb2904b0128b656115d74 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * Allow fancy browser to navigate to Urls with missing scheme.Michael Brüning2012-12-062-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | User-entered urls are now sanitized through QUrl::fromUserInput, which adds missing default schemes. Task-number: QTBUG-28401 Change-Id: I42d33095d84ed2a95745e12832aa966be561753d Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * Doc: Added documentation for the examplesVenugopal Shivashankar2012-12-0510-1/+469
| | | | | | | | | | | | | | | | | | Moved the documentation for fancybrowser, formextractor, previewer, and domtraversal examples from qtdoc. Task-number: QTBUG-27515 Change-Id: I6fd26488b6d854caa600c5db2014532fa1c848d7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * sync.profile: Point dependencies to 'refs/heads/stable'v5.0.0-rc1Sergio Ahumada2012-12-041-8/+8
|/ | | | | | | | | | | We should test stable branches against stable branches only. At some point we should automate the merges from dev->stable->release and decide how to handle possible merge conflicts. This is good enough for the time being. Change-Id: I0215dcb6759cdafe217d14cb61d87037a9e7d935 Reviewed-by: Janne Anttila <janne.anttila@digia.com>
* Examples: Don't build qml examples as app_bundleCaroline Chao2012-11-282-0/+4
| | | | | | | | | | | Don't build flickrview and youtubeview as app_bundle on Mac. The qml example currently looks for the the qml source file inside the application bundle and cannot find it. Change-Id: If83e6c082e6aa98cec98ca416a954e359e6c658e Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix capitalization of "Qt"Robert Loehning2012-11-281-1/+1
| | | | | Change-Id: I48ed2a85b8e88e6bcf3143f99510c5a7169cd9ac Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Update information from Nokia to Digia and Qt ProjectSergio Ahumada2012-11-278-9/+9
| | | | | | Task-number: QTBUG-28156 Change-Id: I16ac473c25c9ab5baec93cfc8523b26da5be80f2 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
View Lorry Controller Status