diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-06 16:14:03 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-01-09 08:01:30 +0100 |
| commit | d0dac4f4bf00810cf61a5a774a5b4d100fa802ba (patch) | |
| tree | 845802baa69d6a58053ace96851c29e9978d0325 /examples | |
| parent | 8c1beff1a8c2620ad645124dc2a4e097ca80bc29 (diff) | |
| download | qtwebkit-examples-d0dac4f4bf00810cf61a5a774a5b4d100fa802ba.tar.gz | |
Fix compilation
Use QtWidgets where needed and ran fixqt4headers.
Change-Id: I000b76009a1a26317d747203ebaca0ec445f8753
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'examples')
69 files changed, 123 insertions, 118 deletions
diff --git a/examples/browser/bookmarks.cpp b/examples/browser/bookmarks.cpp index 229125c..d3437e5 100644 --- a/examples/browser/bookmarks.cpp +++ b/examples/browser/bookmarks.cpp @@ -52,11 +52,11 @@ #include <QtGui/QDesktopServices> #include <QtGui/QDragEnterEvent> -#include <QtGui/QFileDialog> -#include <QtGui/QHeaderView> -#include <QtGui/QIcon> -#include <QtGui/QMessageBox> -#include <QtGui/QToolButton> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QIcon> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QToolButton> #include <QtWebKit/QWebSettings> diff --git a/examples/browser/bookmarks.h b/examples/browser/bookmarks.h index 5134912..74dbd0a 100644 --- a/examples/browser/bookmarks.h +++ b/examples/browser/bookmarks.h @@ -45,7 +45,7 @@ #include <QtCore/QObject> #include <QtCore/QAbstractItemModel> -#include <QtGui/QUndoCommand> +#include <QtWidgets/QUndoCommand> /*! Bookmark manager, owner of the bookmarks, loads, saves and basic tasks @@ -147,7 +147,7 @@ private: /*! BookmarksModel is a QAbstractItemModel wrapper around the BookmarkManager */ -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> class BookmarksModel : public QAbstractItemModel { Q_OBJECT @@ -221,7 +221,7 @@ private: Proxy model that filters out the bookmarks so only the folders are left behind. Used in the add bookmark dialog combobox. */ -#include <QtGui/QSortFilterProxyModel> +#include <QtCore/QSortFilterProxyModel> class AddBookmarkProxyModel : public QSortFilterProxyModel { Q_OBJECT @@ -280,7 +280,7 @@ private: TreeProxyModel *m_proxyModel; }; -#include <QtGui/QToolBar> +#include <QtWidgets/QToolBar> class BookmarksToolBar : public QToolBar { Q_OBJECT diff --git a/examples/browser/browser.pro b/examples/browser/browser.pro index 7ecc721..283e3c1 100644 --- a/examples/browser/browser.pro +++ b/examples/browser/browser.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = browser -QT += webkit network +QT += webkit network widgets printsupport CONFIG += qt warn_on contains(QT_BUILD_PARTS, tools):!embedded: CONFIG += uitools diff --git a/examples/browser/browserapplication.cpp b/examples/browser/browserapplication.cpp index e01920a..c6e98f7 100644 --- a/examples/browser/browserapplication.cpp +++ b/examples/browser/browserapplication.cpp @@ -59,7 +59,7 @@ #include <QtGui/QDesktopServices> #include <QtGui/QFileOpenEvent> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include <QtNetwork/QLocalServer> #include <QtNetwork/QLocalSocket> @@ -173,7 +173,7 @@ BrowserApplication *BrowserApplication::instance() } #if defined(Q_WS_MAC) -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> void BrowserApplication::quitBrowser() { clean(); diff --git a/examples/browser/browserapplication.h b/examples/browser/browserapplication.h index 9bacbe9..e3b363a 100644 --- a/examples/browser/browserapplication.h +++ b/examples/browser/browserapplication.h @@ -42,12 +42,12 @@ #ifndef BROWSERAPPLICATION_H #define BROWSERAPPLICATION_H -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtCore/QUrl> #include <QtCore/QPointer> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> QT_BEGIN_NAMESPACE class QLocalServer; diff --git a/examples/browser/browsermainwindow.cpp b/examples/browser/browsermainwindow.cpp index 30856be..86eca57 100644 --- a/examples/browser/browsermainwindow.cpp +++ b/examples/browser/browsermainwindow.cpp @@ -55,17 +55,17 @@ #include <QtCore/QSettings> -#include <QtGui/QDesktopWidget> -#include <QtGui/QFileDialog> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QPrintDialog> -#include <QtGui/QPrintPreviewDialog> -#include <QtGui/QPrinter> -#include <QtGui/QMenuBar> -#include <QtGui/QMessageBox> -#include <QtGui/QStatusBar> -#include <QtGui/QToolBar> -#include <QtGui/QInputDialog> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QPlainTextEdit> +#include <QtPrintSupport/QPrintDialog> +#include <QtPrintSupport/QPrintPreviewDialog> +#include <QtPrintSupport/QPrinter> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QInputDialog> #include <QtWebKit/QWebFrame> #include <QtWebKit/QWebHistory> diff --git a/examples/browser/browsermainwindow.h b/examples/browser/browsermainwindow.h index 21b2712..b9d953e 100644 --- a/examples/browser/browsermainwindow.h +++ b/examples/browser/browsermainwindow.h @@ -42,8 +42,8 @@ #ifndef BROWSERMAINWINDOW_H #define BROWSERMAINWINDOW_H -#include <QtGui/QMainWindow> -#include <QtGui/QIcon> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QIcon> #include <QtCore/QUrl> class AutoSaver; diff --git a/examples/browser/chasewidget.cpp b/examples/browser/chasewidget.cpp index e0093f6..03590e2 100644 --- a/examples/browser/chasewidget.cpp +++ b/examples/browser/chasewidget.cpp @@ -43,7 +43,7 @@ #include <QtCore/QPoint> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QHideEvent> #include <QtGui/QPainter> #include <QtGui/QPaintEvent> diff --git a/examples/browser/chasewidget.h b/examples/browser/chasewidget.h index efd1648..1bd743a 100644 --- a/examples/browser/chasewidget.h +++ b/examples/browser/chasewidget.h @@ -42,7 +42,7 @@ #ifndef CHASEWIDGET_H #define CHASEWIDGET_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtCore/QSize> #include <QtGui/QColor> diff --git a/examples/browser/cookiejar.cpp b/examples/browser/cookiejar.cpp index 349af7f..bebe34e 100644 --- a/examples/browser/cookiejar.cpp +++ b/examples/browser/cookiejar.cpp @@ -50,13 +50,13 @@ #include <QtCore/QSettings> #include <QtCore/QUrl> -#include <QtGui/QCompleter> +#include <QtWidgets/QCompleter> #include <QtGui/QDesktopServices> #include <QtGui/QFont> #include <QtGui/QFontMetrics> -#include <QtGui/QHeaderView> +#include <QtWidgets/QHeaderView> #include <QtGui/QKeyEvent> -#include <QtGui/QSortFilterProxyModel> +#include <QtCore/QSortFilterProxyModel> #include <QtWebKit/QWebSettings> diff --git a/examples/browser/cookiejar.h b/examples/browser/cookiejar.h index 2b73569..bc6d0eb 100644 --- a/examples/browser/cookiejar.h +++ b/examples/browser/cookiejar.h @@ -47,8 +47,8 @@ #include <QtCore/QAbstractItemModel> #include <QtCore/QStringList> -#include <QtGui/QDialog> -#include <QtGui/QTableView> +#include <QtWidgets/QDialog> +#include <QtWidgets/QTableView> QT_BEGIN_NAMESPACE class QSortFilterProxyModel; diff --git a/examples/browser/downloadmanager.cpp b/examples/browser/downloadmanager.cpp index 74e2e97..f58f359 100644 --- a/examples/browser/downloadmanager.cpp +++ b/examples/browser/downloadmanager.cpp @@ -51,9 +51,9 @@ #include <QtCore/QSettings> #include <QtGui/QDesktopServices> -#include <QtGui/QFileDialog> -#include <QtGui/QHeaderView> -#include <QtGui/QFileIconProvider> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QFileIconProvider> #include <QtCore/QDebug> diff --git a/examples/browser/edittableview.h b/examples/browser/edittableview.h index e2fe154..1f1b07d 100644 --- a/examples/browser/edittableview.h +++ b/examples/browser/edittableview.h @@ -42,7 +42,7 @@ #ifndef EDITTABLEVIEW_H #define EDITTABLEVIEW_H -#include <QtGui/QTableView> +#include <QtWidgets/QTableView> class EditTableView : public QTableView { diff --git a/examples/browser/edittreeview.h b/examples/browser/edittreeview.h index 34dd1d6..60f2cfe 100644 --- a/examples/browser/edittreeview.h +++ b/examples/browser/edittreeview.h @@ -42,7 +42,7 @@ #ifndef EDITTREEVIEW_H #define EDITTREEVIEW_H -#include <QtGui/QTreeView> +#include <QtWidgets/QTreeView> class EditTreeView : public QTreeView { diff --git a/examples/browser/history.cpp b/examples/browser/history.cpp index 5140882..bf437fd 100644 --- a/examples/browser/history.cpp +++ b/examples/browser/history.cpp @@ -56,8 +56,8 @@ #include <QtGui/QClipboard> #include <QtGui/QDesktopServices> -#include <QtGui/QHeaderView> -#include <QtGui/QStyle> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QStyle> #include <QtWebKit/QWebHistoryInterface> #include <QtWebKit/QWebSettings> diff --git a/examples/browser/history.h b/examples/browser/history.h index 03ec241..e9d46bf 100644 --- a/examples/browser/history.h +++ b/examples/browser/history.h @@ -50,7 +50,7 @@ #include <QtCore/QTimer> #include <QtCore/QUrl> -#include <QtGui/QSortFilterProxyModel> +#include <QtCore/QSortFilterProxyModel> #include <QWebHistoryInterface> diff --git a/examples/browser/modelmenu.h b/examples/browser/modelmenu.h index 19d35ce..4ee4cb3 100644 --- a/examples/browser/modelmenu.h +++ b/examples/browser/modelmenu.h @@ -42,7 +42,7 @@ #ifndef MODELMENU_H #define MODELMENU_H -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtCore/QAbstractItemModel> // A QMenu that is dynamically populated from a QAbstractItemModel diff --git a/examples/browser/networkaccessmanager.cpp b/examples/browser/networkaccessmanager.cpp index 40b0893..3eb0cb7 100644 --- a/examples/browser/networkaccessmanager.cpp +++ b/examples/browser/networkaccessmanager.cpp @@ -49,9 +49,9 @@ #include <QtCore/QSettings> #include <QtGui/QDesktopServices> -#include <QtGui/QDialog> -#include <QtGui/QMessageBox> -#include <QtGui/QStyle> +#include <QtWidgets/QDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QStyle> #include <QtGui/QTextDocument> #include <QtNetwork/QAuthenticator> diff --git a/examples/browser/searchlineedit.cpp b/examples/browser/searchlineedit.cpp index 287a1cc..1b1798b 100644 --- a/examples/browser/searchlineedit.cpp +++ b/examples/browser/searchlineedit.cpp @@ -43,9 +43,9 @@ #include <QtGui/QPainter> #include <QtGui/QMouseEvent> -#include <QtGui/QMenu> -#include <QtGui/QStyle> -#include <QtGui/QStyleOptionFrameV2> +#include <QtWidgets/QMenu> +#include <QtWidgets/QStyle> +#include <QtWidgets/QStyleOptionFrameV2> ClearButton::ClearButton(QWidget *parent) : QAbstractButton(parent) diff --git a/examples/browser/searchlineedit.h b/examples/browser/searchlineedit.h index 1f52f4a..ea41657 100644 --- a/examples/browser/searchlineedit.h +++ b/examples/browser/searchlineedit.h @@ -44,8 +44,8 @@ #include "urllineedit.h" -#include <QtGui/QLineEdit> -#include <QtGui/QAbstractButton> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QAbstractButton> QT_BEGIN_NAMESPACE class QMenu; diff --git a/examples/browser/settings.cpp b/examples/browser/settings.cpp index f925da6..f959ec5 100644 --- a/examples/browser/settings.cpp +++ b/examples/browser/settings.cpp @@ -49,7 +49,7 @@ #include "webview.h" #include <QtCore/QSettings> -#include <QtGui/QtGui> +#include <QtWidgets/QtWidgets> #include <QtWebKit/QtWebKit> SettingsDialog::SettingsDialog(QWidget *parent) diff --git a/examples/browser/settings.h b/examples/browser/settings.h index cfe3147..d49cd7b 100644 --- a/examples/browser/settings.h +++ b/examples/browser/settings.h @@ -42,7 +42,7 @@ #ifndef SETTINGS_H #define SETTINGS_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include "ui_settings.h" class SettingsDialog : public QDialog, public Ui_Settings diff --git a/examples/browser/squeezelabel.h b/examples/browser/squeezelabel.h index cae0279..8c72cb4 100644 --- a/examples/browser/squeezelabel.h +++ b/examples/browser/squeezelabel.h @@ -42,7 +42,7 @@ #ifndef SQUEEZELABEL_H #define SQUEEZELABEL_H -#include <QtGui/QLabel> +#include <QtWidgets/QLabel> class SqueezeLabel : public QLabel { diff --git a/examples/browser/tabwidget.cpp b/examples/browser/tabwidget.cpp index 9e155fd..0613a91 100644 --- a/examples/browser/tabwidget.cpp +++ b/examples/browser/tabwidget.cpp @@ -47,15 +47,17 @@ #include "urllineedit.h" #include "webview.h" +#include <QtCore/QMimeData> #include <QtGui/QClipboard> -#include <QtGui/QCompleter> -#include <QtGui/QListView> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> +#include <QtWidgets/QCompleter> +#include <QtWidgets/QListView> +#include <QtWidgets/QMenu> +#include <QtWidgets/QMessageBox> +#include <QtGui/QDrag> #include <QtGui/QMouseEvent> -#include <QtGui/QStackedWidget> -#include <QtGui/QStyle> -#include <QtGui/QToolButton> +#include <QtWidgets/QStackedWidget> +#include <QtWidgets/QStyle> +#include <QtWidgets/QToolButton> #include <QtCore/QDebug> diff --git a/examples/browser/tabwidget.h b/examples/browser/tabwidget.h index e82cd5e..1da4d05 100644 --- a/examples/browser/tabwidget.h +++ b/examples/browser/tabwidget.h @@ -42,9 +42,9 @@ #ifndef TABWIDGET_H #define TABWIDGET_H -#include <QtGui/QTabBar> +#include <QtWidgets/QTabBar> -#include <QtGui/QShortcut> +#include <QtWidgets/QShortcut> /* Tab bar with a few more features such as a context menu and shortcuts */ @@ -120,7 +120,7 @@ private: }; #include <QtCore/QUrl> -#include <QtGui/QTabWidget> +#include <QtWidgets/QTabWidget> QT_BEGIN_NAMESPACE class QCompleter; class QLineEdit; diff --git a/examples/browser/toolbarsearch.cpp b/examples/browser/toolbarsearch.cpp index 6c0cc4b..ec4f594 100644 --- a/examples/browser/toolbarsearch.cpp +++ b/examples/browser/toolbarsearch.cpp @@ -45,9 +45,9 @@ #include <QtCore/QSettings> #include <QtCore/QUrl> -#include <QtGui/QCompleter> -#include <QtGui/QMenu> -#include <QtGui/QStringListModel> +#include <QtWidgets/QCompleter> +#include <QtWidgets/QMenu> +#include <QtCore/QStringListModel> #include <QtWebKit/QWebSettings> diff --git a/examples/browser/urllineedit.cpp b/examples/browser/urllineedit.cpp index a8cfff8..55f6498 100644 --- a/examples/browser/urllineedit.cpp +++ b/examples/browser/urllineedit.cpp @@ -46,16 +46,18 @@ #include "webview.h" #include <QtCore/QEvent> +#include <QtCore/QMimeData> -#include <QtGui/QApplication> -#include <QtGui/QCompleter> +#include <QtWidgets/QApplication> +#include <QtWidgets/QCompleter> #include <QtGui/QFocusEvent> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLineEdit> +#include <QtGui/QDrag> #include <QtGui/QPainter> -#include <QtGui/QStyle> -#include <QtGui/QStyleOptionFrameV2> +#include <QtWidgets/QStyle> +#include <QtWidgets/QStyleOptionFrameV2> #include <QtCore/QDebug> diff --git a/examples/browser/urllineedit.h b/examples/browser/urllineedit.h index f21fe2d..c5e07e6 100644 --- a/examples/browser/urllineedit.h +++ b/examples/browser/urllineedit.h @@ -43,8 +43,8 @@ #define URLLINEEDIT_H #include <QtCore/QUrl> -#include <QtGui/QWidget> -#include <QtGui/QStyleOptionFrame> +#include <QtWidgets/QWidget> +#include <QtWidgets/QStyleOptionFrame> QT_BEGIN_NAMESPACE class QLineEdit; diff --git a/examples/browser/webview.cpp b/examples/browser/webview.cpp index 0d84778..ed23a8f 100644 --- a/examples/browser/webview.cpp +++ b/examples/browser/webview.cpp @@ -48,8 +48,8 @@ #include "webview.h" #include <QtGui/QClipboard> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMenu> +#include <QtWidgets/QMessageBox> #include <QtGui/QMouseEvent> #include <QtWebKit/QWebHitTestResult> diff --git a/examples/embedded/anomaly/anomaly.pro b/examples/embedded/anomaly/anomaly.pro index cb851b6..005aa3f 100644 --- a/examples/embedded/anomaly/anomaly.pro +++ b/examples/embedded/anomaly/anomaly.pro @@ -1,5 +1,6 @@ QT += network \ - webkit + webkit \ + widgets HEADERS += src/BrowserWindow.h \ src/BrowserView.h \ src/TitleBar.h \ diff --git a/examples/embedded/anomaly/src/AddressBar.cpp b/examples/embedded/anomaly/src/AddressBar.cpp index aa9d03d..a9dae40 100644 --- a/examples/embedded/anomaly/src/AddressBar.cpp +++ b/examples/embedded/anomaly/src/AddressBar.cpp @@ -42,7 +42,7 @@ #include "AddressBar.h" #include <QtCore> -#include <QtGui> +#include <QtWidgets> AddressBar::AddressBar(QWidget *parent) : QWidget(parent) diff --git a/examples/embedded/anomaly/src/BookmarksView.cpp b/examples/embedded/anomaly/src/BookmarksView.cpp index 67fe9cf..95c673e 100644 --- a/examples/embedded/anomaly/src/BookmarksView.cpp +++ b/examples/embedded/anomaly/src/BookmarksView.cpp @@ -41,7 +41,7 @@ #include "BookmarksView.h" -#include <QtGui> +#include <QtWidgets> BookmarksView::BookmarksView(QWidget *parent) : QWidget(parent) diff --git a/examples/embedded/anomaly/src/BrowserView.cpp b/examples/embedded/anomaly/src/BrowserView.cpp index 2b42984..51d1c89 100644 --- a/examples/embedded/anomaly/src/BrowserView.cpp +++ b/examples/embedded/anomaly/src/BrowserView.cpp @@ -41,7 +41,7 @@ #include "BrowserView.h" -#include <QtGui> +#include <QtWidgets> #include <QtNetwork> #include <QtWebKit> diff --git a/examples/embedded/anomaly/src/BrowserWindow.cpp b/examples/embedded/anomaly/src/BrowserWindow.cpp index e60e3a2..597ccc8 100644 --- a/examples/embedded/anomaly/src/BrowserWindow.cpp +++ b/examples/embedded/anomaly/src/BrowserWindow.cpp @@ -42,7 +42,7 @@ #include "BrowserWindow.h" #include <QtCore> -#include <QtGui> +#include <QtWidgets> #include <QPropertyAnimation> #include <QResizeEvent> diff --git a/examples/embedded/anomaly/src/ControlStrip.cpp b/examples/embedded/anomaly/src/ControlStrip.cpp index 747f0fe..9755996 100644 --- a/examples/embedded/anomaly/src/ControlStrip.cpp +++ b/examples/embedded/anomaly/src/ControlStrip.cpp @@ -42,7 +42,7 @@ #include "ControlStrip.h" #include <QtCore> -#include <QtGui> +#include <QtWidgets> ControlStrip::ControlStrip(QWidget *parent) : QWidget(parent) diff --git a/examples/embedded/anomaly/src/HomeView.cpp b/examples/embedded/anomaly/src/HomeView.cpp index 251f565..f864804 100644 --- a/examples/embedded/anomaly/src/HomeView.cpp +++ b/examples/embedded/anomaly/src/HomeView.cpp @@ -42,7 +42,7 @@ #include "HomeView.h" #include <QtCore> -#include <QtGui> +#include <QtWidgets> #include "AddressBar.h" #include "BookmarksView.h" diff --git a/examples/embedded/anomaly/src/Main.cpp b/examples/embedded/anomaly/src/Main.cpp index e05b865..084a8e6 100644 --- a/examples/embedded/anomaly/src/Main.cpp +++ b/examples/embedded/anomaly/src/Main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtCore> -#include <QtGui> +#include <QtWidgets> #include <QtWebKit> #include "BrowserWindow.h" diff --git a/examples/embedded/anomaly/src/TitleBar.cpp b/examples/embedded/anomaly/src/TitleBar.cpp index e28807c..9c8b682 100644 --- a/examples/embedded/anomaly/src/TitleBar.cpp +++ b/examples/embedded/anomaly/src/TitleBar.cpp @@ -42,7 +42,7 @@ #include "TitleBar.h" #include <QtCore> -#include <QtGui> +#include <QtWidgets> TitleBar::TitleBar(QWidget *parent) : QWidget(parent) diff --git a/examples/embedded/anomaly/src/ZoomStrip.cpp b/examples/embedded/anomaly/src/ZoomStrip.cpp index 5d376e5..5eb7bf0 100644 --- a/examples/embedded/anomaly/src/ZoomStrip.cpp +++ b/examples/embedded/anomaly/src/ZoomStrip.cpp @@ -42,7 +42,7 @@ #include "ZoomStrip.h" #include <QtCore> -#include <QtGui> +#include <QtWidgets> ZoomStrip::ZoomStrip(QWidget *parent) : QWidget(parent) diff --git a/examples/scroller/plot/plot.pro b/examples/scroller/plot/plot.pro index b23a3c0..6d670e5 100644 --- a/examples/scroller/plot/plot.pro +++ b/examples/scroller/plot/plot.pro @@ -4,7 +4,7 @@ SOURCES = settingswidget.cpp \ plotwidget.cpp \ main.cpp -QT += webkit +QT += webkit widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/plot diff --git a/examples/scroller/wheel/main.cpp b/examples/scroller/wheel/main.cpp index 3b28b58..57b78d0 100644 --- a/examples/scroller/wheel/main.cpp +++ b/examples/scroller/wheel/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <qmath.h> #include "wheelwidget.h" diff --git a/examples/scroller/wheel/wheel.pro b/examples/scroller/wheel/wheel.pro index cd86bca..0be0092 100644 --- a/examples/scroller/wheel/wheel.pro +++ b/examples/scroller/wheel/wheel.pro @@ -2,7 +2,7 @@ HEADERS = wheelwidget.h SOURCES = wheelwidget.cpp \ main.cpp -QT += webkit +QT += webkit widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/wheel diff --git a/examples/scroller/wheel/wheelwidget.cpp b/examples/scroller/wheel/wheelwidget.cpp index 89ff947..46eecb1 100644 --- a/examples/scroller/wheel/wheelwidget.cpp +++ b/examples/scroller/wheel/wheelwidget.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "wheelwidget.h" diff --git a/examples/webkit/domtraversal/domtraversal.pro b/examples/webkit/domtraversal/domtraversal.pro index 51b59d2..4db769a 100644 --- a/examples/webkit/domtraversal/domtraversal.pro +++ b/examples/webkit/domtraversal/domtraversal.pro @@ -1,4 +1,4 @@ -QT += webkit network +QT += webkit network widgets FORMS = window.ui HEADERS = window.h SOURCES = main.cpp \ diff --git a/examples/webkit/domtraversal/window.cpp b/examples/webkit/domtraversal/window.cpp index 12feac6..a5e33ac 100644 --- a/examples/webkit/domtraversal/window.cpp +++ b/examples/webkit/domtraversal/window.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <QtWebKit> #include "window.h" diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro index 1aed40d..18fbec5 100644 --- a/examples/webkit/fancybrowser/fancybrowser.pro +++ b/examples/webkit/fancybrowser/fancybrowser.pro @@ -1,4 +1,4 @@ -QT += webkit network +QT += webkit network widgets HEADERS = mainwindow.h SOURCES = main.cpp \ mainwindow.cpp diff --git a/examples/webkit/fancybrowser/main.cpp b/examples/webkit/fancybrowser/main.cpp index cb72a6f..c18e266 100644 --- a/examples/webkit/fancybrowser/main.cpp +++ b/examples/webkit/fancybrowser/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" int main(int argc, char * argv[]) diff --git a/examples/webkit/fancybrowser/mainwindow.cpp b/examples/webkit/fancybrowser/mainwindow.cpp index 4696f3f..bb67f9b 100644 --- a/examples/webkit/fancybrowser/mainwindow.cpp +++ b/examples/webkit/fancybrowser/mainwindow.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <QtNetwork> #include <QtWebKit> #include "mainwindow.h" diff --git a/examples/webkit/fancybrowser/mainwindow.h b/examples/webkit/fancybrowser/mainwindow.h index f5017a7..5a31f48 100644 --- a/examples/webkit/fancybrowser/mainwindow.h +++ b/examples/webkit/fancybrowser/mainwindow.h @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> class QWebView; QT_BEGIN_NAMESPACE diff --git a/examples/webkit/formextractor/formextractor.h b/examples/webkit/formextractor/formextractor.h index 5839aa2..270b92d 100644 --- a/examples/webkit/formextractor/formextractor.h +++ b/examples/webkit/formextractor/formextractor.h @@ -41,7 +41,7 @@ #ifndef FORMEXTRACTOR_H #define FORMEXTRACTOR_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QWebFrame> #include "ui_formextractor.h" diff --git a/examples/webkit/formextractor/formextractor.pro b/examples/webkit/formextractor/formextractor.pro index 951dfe5..7a7428e 100644 --- a/examples/webkit/formextractor/formextractor.pro +++ b/examples/webkit/formextractor/formextractor.pro @@ -1,4 +1,4 @@ -QT += webkit network +QT += webkit network widgets TARGET = formextractor TEMPLATE = app SOURCES += main.cpp \ diff --git a/examples/webkit/formextractor/main.cpp b/examples/webkit/formextractor/main.cpp index c0940b2..ac6bf3b 100644 --- a/examples/webkit/formextractor/main.cpp +++ b/examples/webkit/formextractor/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "mainwindow.h" int main(int argc, char *argv[]) diff --git a/examples/webkit/formextractor/mainwindow.cpp b/examples/webkit/formextractor/mainwindow.cpp index 6ef8599..080cca9 100644 --- a/examples/webkit/formextractor/mainwindow.cpp +++ b/examples/webkit/formextractor/mainwindow.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" MainWindow::MainWindow() diff --git a/examples/webkit/framecapture/framecapture.pro b/examples/webkit/framecapture/framecapture.pro index 8880259..3f39bef 100644 --- a/examples/webkit/framecapture/framecapture.pro +++ b/examples/webkit/framecapture/framecapture.pro @@ -1,4 +1,4 @@ -QT += webkit network +QT += webkit network widgets HEADERS = framecapture.h SOURCES = main.cpp \ diff --git a/examples/webkit/framecapture/main.cpp b/examples/webkit/framecapture/main.cpp index 867787e..c73718c 100644 --- a/examples/webkit/framecapture/main.cpp +++ b/examples/webkit/framecapture/main.cpp @@ -41,7 +41,7 @@ #include "framecapture.h" #include <iostream> -#include <QtGui> +#include <QtWidgets> int main(int argc, char * argv[]) { diff --git a/examples/webkit/googlechat/googlechat.cpp b/examples/webkit/googlechat/googlechat.cpp index 1b81dd5..9ae6509 100644 --- a/examples/webkit/googlechat/googlechat.cpp +++ b/examples/webkit/googlechat/googlechat.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <QtWebKit> #include <QSslSocket> diff --git a/examples/webkit/googlechat/googlechat.pro b/examples/webkit/googlechat/googlechat.pro index ff2cf00..39784cd 100644 --- a/examples/webkit/googlechat/googlechat.pro +++ b/examples/webkit/googlechat/googlechat.pro @@ -1,4 +1,4 @@ -QT += webkit network +QT += webkit network widgets HEADERS = googlechat.h SOURCES = main.cpp \ googlechat.cpp diff --git a/examples/webkit/googlechat/main.cpp b/examples/webkit/googlechat/main.cpp index 32b9151..50a9a81 100644 --- a/examples/webkit/googlechat/main.cpp +++ b/examples/webkit/googlechat/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <QNetworkProxyFactory> #include "googlechat.h" diff --git a/examples/webkit/imageanalyzer/imageanalyzer.h b/examples/webkit/imageanalyzer/imageanalyzer.h index 2a8ff19..e42f805 100644 --- a/examples/webkit/imageanalyzer/imageanalyzer.h +++ b/examples/webkit/imageanalyzer/imageanalyzer.h @@ -42,7 +42,7 @@ #define IMAGEANALYZER_H #include <QFutureWatcher> -#include <QtGui> +#include <QtWidgets> QT_BEGIN_NAMESPACE class QNetworkAccessManager; diff --git a/examples/webkit/imageanalyzer/imageanalyzer.pro b/examples/webkit/imageanalyzer/imageanalyzer.pro index c9a0ed1..d48d2e1 100644 --- a/examples/webkit/imageanalyzer/imageanalyzer.pro +++ b/examples/webkit/imageanalyzer/imageanalyzer.pro @@ -5,7 +5,7 @@ SOURCES = imageanalyzer.cpp \ main.cpp \ mainwindow.cpp -QT += network webkit +QT += network webkit widgets RESOURCES = resources/imageanalyzer.qrc diff --git a/examples/webkit/previewer/main.cpp b/examples/webkit/previewer/main.cpp index 1367dba..a0a4114 100644 --- a/examples/webkit/previewer/main.cpp +++ b/examples/webkit/previewer/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" //! [0] diff --git a/examples/webkit/previewer/mainwindow.cpp b/examples/webkit/previewer/mainwindow.cpp index 6532330..f323350 100644 --- a/examples/webkit/previewer/mainwindow.cpp +++ b/examples/webkit/previewer/mainwindow.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <QtWebKit> #include "mainwindow.h" diff --git a/examples/webkit/previewer/previewer.cpp b/examples/webkit/previewer/previewer.cpp index afee92c..3c97ac9 100644 --- a/examples/webkit/previewer/previewer.cpp +++ b/examples/webkit/previewer/previewer.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "previewer.h" //! [0] diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro index 0d1dc62..a00db22 100644 --- a/examples/webkit/previewer/previewer.pro +++ b/examples/webkit/previewer/previewer.pro @@ -1,4 +1,4 @@ -QT += webkit network +QT += webkit network widgets HEADERS = previewer.h \ mainwindow.h SOURCES = main.cpp \ diff --git a/examples/webkit/simpleselector/main.cpp b/examples/webkit/simpleselector/main.cpp index f204974..26a2f74 100644 --- a/examples/webkit/simpleselector/main.cpp +++ b/examples/webkit/simpleselector/main.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ //! [main program] -#include <QtGui> +#include <QtWidgets> #include "window.h" int main(int argc, char *argv[]) diff --git a/examples/webkit/simpleselector/simpleselector.pro b/examples/webkit/simpleselector/simpleselector.pro index 961b7bd..44fc29f 100644 --- a/examples/webkit/simpleselector/simpleselector.pro +++ b/examples/webkit/simpleselector/simpleselector.pro @@ -1,4 +1,4 @@ -QT += webkit network +QT += webkit network widgets FORMS = window.ui HEADERS = window.h SOURCES = main.cpp \ diff --git a/examples/xmlpatterns/qobjectxmlmodel/main.cpp b/examples/xmlpatterns/qobjectxmlmodel/main.cpp index 10e5378..70477c7 100644 --- a/examples/xmlpatterns/qobjectxmlmodel/main.cpp +++ b/examples/xmlpatterns/qobjectxmlmodel/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include "mainwindow.h" diff --git a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp b/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp index e4e11b4..b0b2497 100644 --- a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp +++ b/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> #include <QtXmlPatterns> #include "mainwindow.h" diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro index fafa5b1..5864b26 100644 --- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro +++ b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro @@ -1,6 +1,6 @@ FORMS += forms/mainwindow.ui -QT += xmlpatterns webkit +QT += xmlpatterns webkit widgets SOURCES += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp HEADERS += qobjectxmlmodel.h mainwindow.h ../shared/xmlsyntaxhighlighter.h RESOURCES = queries.qrc |