summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Fix build of browser example with QT_NO_CLIPBOARDv5.4.0-alpha1Allan Sandfeld Jensen2014-09-033-0/+6
| | | | | Change-Id: I408581c6fa655accc22830ed4fb2897a7651dba4 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Update license headers and add new licensesJani Heikkinen2014-08-2462-1175/+679
| | | | | | | - Added LICENSE.LGPL21, LICENSE.LGPLv3 & LICENSE.GPLv2 Change-Id: If7c5fa43341211def780bcb77f922b54ddfafb45 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Fix up Fancy Browser example.v5.3.0-rc1v5.3.0releasebaserock/v5.3.05.3.0Michael Brüning2014-04-141-6/+36
| | | | | | | | | | * Prevent leaking of MainWindow. * Use proper command line argument parsing. * Make the Qt project page the default page. Task-number: QTBUG-38069 Change-Id: I6142ca207e659e47136e47e4d5817dfa617677e8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix up tabbed browser example.Michael Brüning2014-04-145-34/+72
| | | | | | | | | | | * Replaces deprecated Q_WS_MAC preprocessor defines. * Adds a command line parser. * Adds Digia Qt home page to the default bookmarks. * Removes dead Q_WS_QWS flagged code. Task-number: QTBUG-38069 Change-Id: If4ef67434c76c2ea096fa1250a9ffaa0e53e47dd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Doc: Fix most of the documentation warningsSergio Ahumada2014-03-271-2/+2
| | | | | | | | | - adding missing index files to \depends - fix warning: Can't link to 'The QtWebKit Bridge' Change-Id: I60665627f1aadbf7bd8a20ddda7d22db9ad694dc Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Fix typov5.3.0-beta1Sergio Ahumada2014-03-041-1/+1
| | | | | Change-Id: I443e6f97335259c3cea69c296d0b2efe5017ba65 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Remove wrong executable flag from formextractor/form.htmlDmitry Shachnev2013-08-051-0/+0
| | | | | Change-Id: Ic9a0e658b0dc877215eea7f1ad8ff4456235720d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-07-041-1/+1
|\ | | | | | | Change-Id: Iaef8f563467bbcdffb41991e1a0e3cfa85297969
| * 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>
* | Silence compiler warnings in browser example.Friedemann Kleint2013-07-034-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings.cpp(138) : warning C4189: 'jar' : local variable is initialized but not referenced settings.cpp(240) : warning C4189: 'jar' : local variable is initialized but not referenced searchlineedit.cpp: In member function 'virtual void ClearButton::paintEvent(QPaintEvent*)': searchlineedit.cpp:68:12: warning: variable 'color' set but not used [-Wunused-but-set-variable] networkaccessmanager.cpp: In member function 'void NetworkAccessManager::requestFinished(QNetworkReply*)': networkaccessmanager.cpp:115:12: warning: unused variable 'pctCached' [-Wunused-variable] networkaccessmanager.cpp:116:12: warning: unused variable 'pctPipelined' [-Wunused-variable] networkaccessmanager.cpp:117:12: warning: unused variable 'pctSecure' [-Wunused-variable] networkaccessmanager.cpp:118:12: warning: unused variable 'pctDownloadBuffer' [-Wunused-variable] history.cpp: In member function 'virtual int HistoryMenuModel::rowCount(const QModelIndex&) const': history.cpp:516:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] history.cpp: In member function 'virtual QModelIndex HistoryMenuModel::mapToSource(const QModelIndex&) const': history.cpp:541:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] Change-Id: I76ba8ff28509f39c653e9b5ba707e380393dff0d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix the html output of the QObjectXmlModel example.Michael Brüning2013-06-031-1/+1
|/ | | | | | | | | | Added a title to the XQuery file to prevent generating an invalid self-closing title tag in the html output. Task-number: QTBUG-31525 Change-Id: Ieef162ebc9a89028b7cde81d0b42c649232488c7 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@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>
* 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 remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-2511-21/+48
| |\ | | | | | | | | | Change-Id: Icf1cea987daf0b5b9a69823a16416ad6a5cf4a6c
| * | 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>
* | | 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>
* | | build with -no-widgetsv5.0.2Oswald Buddenhagen2013-03-221-1/+2
| |/ |/| | | | | | | Change-Id: Ibd2ef43fbecc26b39fddecba4927acd6585acf79 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | 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>
* 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-07123-123/+123
| | | | | | Change-Id: I08bbc366f34784f5dbc0fa38d7cef33189edd1cf Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@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>
* 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>
* 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>
* 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-1312-12/+12
| | | | | | Change-Id: Ia23f65e754932955f86276f5c2ff901de75ca4a0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: hjk <qthjk@ovi.com>
* Doc: Added documentation for the WebKit Widget examplesVenugopal Shivashankar2012-12-1219-4/+833
| | | | | | | | | | - 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>
* Add brief documentation for flickrview and youtubeviewAndras Becsi2012-12-115-0/+101
| | | | | 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-10212-139/+116
| | | | | | | | 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-081-1/+1
| | | | | | | | | | | 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>
* 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>
* Remove the nonfunctional googlechat exampleAndras Becsi2012-11-266-530/+0
| | | | | | | | | | | The example utilizes the Google Talk Gadget service which has been discontinued as of May 2012. http://support.google.com/talk/answer/2722317?hl=en Change-Id: Iae6f500bef2374c11c4476be2d4fb658f7dd8bf4 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Example: Set qt-project.org as home for the Browser exampleCaroline Chao2012-11-162-8/+8
| | | | | | | | And update other links. Change-Id: I45815e085e2e465568f8b23a551b1123797360c3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix UI glitches in the youtube exampleAndras Becsi2012-11-131-19/+16
| | | | | | | | | | | The MouseArea that is responsible for showing and hiding the thumbnail list should fill the area showing the title of the current video and it should be sufficiently big. This area somehow ended up being a narrow stripe detached from the top edge of the content. Change-Id: Id370584edc7d780e957fa7b4457518ad6f854740 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Fix the detection of the uitools module for the browser exampleAndras Becsi2012-11-131-1/+1
| | | | | | | This fixes the build if uitools is not available. Change-Id: If81d1167cdc9318b91add532e44297dbf7d13237 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Remove obsolete symbian settings from examples' project filesAndras Becsi2012-11-1311-57/+0
| | | | | Change-Id: If60dfa462f45d23edcf47dc647035bbe12d54459 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
* Browser example: update bookmarksCaroline Chao2012-11-092-8/+8
| | | | | | | Replace links pointing to Nokia with Digia's. Change-Id: Ia9736783ee57c9840191ea55d3d5eadade2cdaa7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* CONFIG+=uitools is deprecated. Use QT+=uitools insteadv5.0.0-beta2Sergio Ahumada2012-11-071-1/+1
| | | | | Change-Id: I610a5ad076e7805a6c10ad60b8e69cff2d871a87 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Simplify regexp usageSimon Hausmann2012-11-071-2/+1
| | | | | | | | JS has built-in support for regular expressions, so we don't need to allocate a new RegExp object for each resource request. Change-Id: I7d669252ab60264dc6c7c45de3b7f5c9f74c9158 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix build with latest qtbase and webkitSimon Hausmann2012-10-233-7/+2
| | | | | | | | Don't try to include QPlastiqueStyle, remove dead code. Use webkitwidgets instead of webkit with QT Change-Id: Ief6076755b823887e595d947783343f087ed46d6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
View Lorry Controller Status