summaryrefslogtreecommitdiff
path: root/examples/webkitwidgets/browser
Commit message (Collapse)AuthorAgeFilesLines
* remove dead usage of DEPLOYMENT_PLUGINOswald Buddenhagen2016-12-071-4/+0
| | | | | | | wince is not supported any more, so the scope was dead. Change-Id: I6ea7144c7a93794163b920846ba671beae945701 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Disambiguate name of QLocalServer used in Browser example.v5.5.0-rc1v5.5.05.5.0Friedemann Kleint2015-05-201-1/+2
| | | | | | | | | | Append Qt version and engine name so that it does not lock out the QtWebEngine based browser and allows for comparing different versions of Qt. Change-Id: Id904d2760dbf44777327b6b21847caf35a811e59 Task-number: QTBUG-46233 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Frederik Gladhorn2015-03-171-9/+6
|\ | | | | | | | | | | | | | | Conflicts: examples/webkitwidgets/browser/data/defaultbookmarks.xbel examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp Change-Id: I5b868d5eb612779b70f8bed123ef85c92caeeb06
| * Update links from qt-project.org to qt.iov5.4.25.4.2Sergio Ahumada2015-03-061-9/+6
| | | | | | | | | | | | | | | | - remove http://qt.digia.com since it now points to qt.io - move webkit.org down to match other repos Change-Id: I036b3ed84bdd8023fd32b7e9ccfde787ce666939 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * Adjust wiki links to the new redirectSergio Ahumada2015-03-031-1/+1
| | | | | | | | | | | | | | it looks nicer this way Change-Id: I689ec3945bca341c86713c03fa91eb877dbae5e5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-03-021-1/+1
| | | | | | | | | | Change-Id: Ia6984a4382c4c32e9e28a696dfc85bd59d831140 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fix incrementing tab countFrank Osterfeld2015-03-161-1/+1
| | | | | | | | | | | | | | | | | | The typo raised the clang warning "use of unary operator that may be intended as compound assignment (+=)" Change-Id: I237c2182d097d9c726b50f0db3799e3a3f224299 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1245-298/+298
|/ | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ie12af52d2377d9e9e6f771f676fb286017921c6f Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* 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-2441-776/+448
| | | | | | | - Added LICENSE.LGPL21, LICENSE.LGPLv3 & LICENSE.GPLv2 Change-Id: If7c5fa43341211def780bcb77f922b54ddfafb45 Reviewed-by: Simon Hausmann <simon.hausmann@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>
* 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>
* 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>
* 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-0743-43/+43
| | | | | | Change-Id: I08bbc366f34784f5dbc0fa38d7cef33189edd1cf Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@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>
* Fix webkit example manifest generation.Eike Ziller2012-12-131-1/+1
| | | | | | 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-122-0/+41
| | | | | | | | | | - 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-1066-0/+13449
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>
View Lorry Controller Status