summaryrefslogtreecommitdiff
path: root/examples/webkitwidgets
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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
|\
| * 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>
* 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-07115-115/+115
| | | | | | Change-Id: I08bbc366f34784f5dbc0fa38d7cef33189edd1cf Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> 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-1310-10/+10
| | | | | | 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-1217-0/+825
| | | | | | | | | | - 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>
* Adjust webkit example project install targets.hjk2012-12-10182-0/+22410
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>