diff options
-rw-r--r-- | examples/examples.pro | 6 | ||||
-rw-r--r-- | examples/webengine/quicknanobrowser/ContextMenuExtras.qml (renamed from examples/quick/quicknanobrowser/ContextMenuExtras.qml) | 0 | ||||
-rw-r--r-- | examples/webengine/quicknanobrowser/icons/go-next.png (renamed from examples/quick/quicknanobrowser/icons/go-next.png) | bin | 930 -> 930 bytes | |||
-rw-r--r-- | examples/webengine/quicknanobrowser/icons/go-previous.png (renamed from examples/quick/quicknanobrowser/icons/go-previous.png) | bin | 955 -> 955 bytes | |||
-rw-r--r-- | examples/webengine/quicknanobrowser/icons/process-stop.png (renamed from examples/quick/quicknanobrowser/icons/process-stop.png) | bin | 1272 -> 1272 bytes | |||
-rw-r--r-- | examples/webengine/quicknanobrowser/icons/view-refresh.png (renamed from examples/quick/quicknanobrowser/icons/view-refresh.png) | bin | 1364 -> 1364 bytes | |||
-rw-r--r-- | examples/webengine/quicknanobrowser/main.cpp (renamed from examples/quick/quicknanobrowser/main.cpp) | 0 | ||||
-rw-r--r-- | examples/webengine/quicknanobrowser/quicknanobrowser.pro (renamed from examples/quick/quicknanobrowser/quicknanobrowser.pro) | 2 | ||||
-rw-r--r-- | examples/webengine/quicknanobrowser/quickwindow.cpp (renamed from examples/quick/quicknanobrowser/quickwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/webengine/quicknanobrowser/quickwindow.h (renamed from examples/quick/quicknanobrowser/quickwindow.h) | 0 | ||||
-rw-r--r-- | examples/webengine/quicknanobrowser/quickwindow.qml (renamed from examples/quick/quicknanobrowser/quickwindow.qml) | 0 | ||||
-rw-r--r-- | examples/webengine/quicknanobrowser/resources.qrc (renamed from examples/quick/quicknanobrowser/resources.qrc) | 0 | ||||
-rw-r--r-- | examples/webengine/quicknanobrowser/util.h (renamed from examples/quick/quicknanobrowser/util.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/Info_mac.plist (renamed from examples/widgets/browser/Info_mac.plist) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/addbookmarkdialog.ui (renamed from examples/widgets/browser/addbookmarkdialog.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/autosaver.cpp (renamed from examples/widgets/browser/autosaver.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/autosaver.h (renamed from examples/widgets/browser/autosaver.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/bookmarks.cpp (renamed from examples/widgets/browser/bookmarks.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/bookmarks.h (renamed from examples/widgets/browser/bookmarks.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/bookmarks.ui (renamed from examples/widgets/browser/bookmarks.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/browser.icns (renamed from examples/widgets/browser/browser.icns) | bin | 50218 -> 50218 bytes | |||
-rw-r--r-- | examples/webenginewidgets/browser/browser.ico (renamed from examples/widgets/browser/browser.ico) | bin | 15374 -> 15374 bytes | |||
-rw-r--r-- | examples/webenginewidgets/browser/browser.pro (renamed from examples/widgets/browser/browser.pro) | 2 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/browser.rc (renamed from examples/widgets/browser/browser.rc) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/browserapplication.cpp (renamed from examples/widgets/browser/browserapplication.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/browserapplication.h (renamed from examples/widgets/browser/browserapplication.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/browsermainwindow.cpp (renamed from examples/widgets/browser/browsermainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/browsermainwindow.h (renamed from examples/widgets/browser/browsermainwindow.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/chasewidget.cpp (renamed from examples/widgets/browser/chasewidget.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/chasewidget.h (renamed from examples/widgets/browser/chasewidget.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/cookiejar.cpp (renamed from examples/widgets/browser/cookiejar.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/cookiejar.h (renamed from examples/widgets/browser/cookiejar.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/cookies.ui (renamed from examples/widgets/browser/cookies.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/cookiesexceptions.ui (renamed from examples/widgets/browser/cookiesexceptions.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/data/addtab.png (renamed from examples/widgets/browser/data/addtab.png) | bin | 469 -> 469 bytes | |||
-rw-r--r-- | examples/webenginewidgets/browser/data/browser.svg (renamed from examples/widgets/browser/data/browser.svg) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/data/closetab.png (renamed from examples/widgets/browser/data/closetab.png) | bin | 516 -> 516 bytes | |||
-rw-r--r-- | examples/webenginewidgets/browser/data/data.qrc (renamed from examples/widgets/browser/data/data.qrc) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/data/defaultbookmarks.xbel (renamed from examples/widgets/browser/data/defaultbookmarks.xbel) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/data/defaulticon.png (renamed from examples/widgets/browser/data/defaulticon.png) | bin | 1473 -> 1473 bytes | |||
-rw-r--r-- | examples/webenginewidgets/browser/data/history.png (renamed from examples/widgets/browser/data/history.png) | bin | 1527 -> 1527 bytes | |||
-rw-r--r-- | examples/webenginewidgets/browser/data/loading.gif (renamed from examples/widgets/browser/data/loading.gif) | bin | 847 -> 847 bytes | |||
-rw-r--r-- | examples/webenginewidgets/browser/doc/images/browser-demo.png (renamed from examples/widgets/browser/doc/images/browser-demo.png) | bin | 156342 -> 156342 bytes | |||
-rw-r--r-- | examples/webenginewidgets/browser/doc/src/browser.qdoc (renamed from examples/widgets/browser/doc/src/browser.qdoc) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/downloaditem.ui (renamed from examples/widgets/browser/downloaditem.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/downloadmanager.cpp (renamed from examples/widgets/browser/downloadmanager.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/downloadmanager.h (renamed from examples/widgets/browser/downloadmanager.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/downloads.ui (renamed from examples/widgets/browser/downloads.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/edittableview.cpp (renamed from examples/widgets/browser/edittableview.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/edittableview.h (renamed from examples/widgets/browser/edittableview.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/edittreeview.cpp (renamed from examples/widgets/browser/edittreeview.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/edittreeview.h (renamed from examples/widgets/browser/edittreeview.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/history.cpp (renamed from examples/widgets/browser/history.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/history.h (renamed from examples/widgets/browser/history.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/history.ui (renamed from examples/widgets/browser/history.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/htmls/htmls.qrc (renamed from examples/widgets/browser/htmls/htmls.qrc) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/htmls/notfound.html (renamed from examples/widgets/browser/htmls/notfound.html) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/main.cpp (renamed from examples/widgets/browser/main.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/modelmenu.cpp (renamed from examples/widgets/browser/modelmenu.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/modelmenu.h (renamed from examples/widgets/browser/modelmenu.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/networkaccessmanager.cpp (renamed from examples/widgets/browser/networkaccessmanager.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/networkaccessmanager.h (renamed from examples/widgets/browser/networkaccessmanager.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/passworddialog.ui (renamed from examples/widgets/browser/passworddialog.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/proxy.ui (renamed from examples/widgets/browser/proxy.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/searchlineedit.cpp (renamed from examples/widgets/browser/searchlineedit.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/searchlineedit.h (renamed from examples/widgets/browser/searchlineedit.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/settings.cpp (renamed from examples/widgets/browser/settings.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/settings.h (renamed from examples/widgets/browser/settings.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/settings.ui (renamed from examples/widgets/browser/settings.ui) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/squeezelabel.cpp (renamed from examples/widgets/browser/squeezelabel.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/squeezelabel.h (renamed from examples/widgets/browser/squeezelabel.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/tabwidget.cpp (renamed from examples/widgets/browser/tabwidget.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/tabwidget.h (renamed from examples/widgets/browser/tabwidget.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/toolbarsearch.cpp (renamed from examples/widgets/browser/toolbarsearch.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/toolbarsearch.h (renamed from examples/widgets/browser/toolbarsearch.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/urllineedit.cpp (renamed from examples/widgets/browser/urllineedit.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/urllineedit.h (renamed from examples/widgets/browser/urllineedit.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/webview.cpp (renamed from examples/widgets/browser/webview.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/webview.h (renamed from examples/widgets/browser/webview.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/xbel.cpp (renamed from examples/widgets/browser/xbel.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/browser/xbel.h (renamed from examples/widgets/browser/xbel.h) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/fancybrowser/doc/images/fancybrowser-example.png (renamed from examples/widgets/fancybrowser/doc/images/fancybrowser-example.png) | bin | 98031 -> 98031 bytes | |||
-rw-r--r-- | examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc (renamed from examples/widgets/fancybrowser/doc/src/fancybrowser.qdoc) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/fancybrowser/fancybrowser.pro (renamed from examples/widgets/fancybrowser/fancybrowser.pro) | 2 | ||||
-rw-r--r-- | examples/webenginewidgets/fancybrowser/jquery.min.js (renamed from examples/widgets/fancybrowser/jquery.min.js) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/fancybrowser/jquery.qrc (renamed from examples/widgets/fancybrowser/jquery.qrc) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/fancybrowser/main.cpp (renamed from examples/widgets/fancybrowser/main.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/fancybrowser/mainwindow.cpp (renamed from examples/widgets/fancybrowser/mainwindow.cpp) | 0 | ||||
-rw-r--r-- | examples/webenginewidgets/fancybrowser/mainwindow.h (renamed from examples/widgets/fancybrowser/mainwindow.h) | 0 |
89 files changed, 6 insertions, 6 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 4952e0b15..7940e289d 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,8 +1,8 @@ TEMPLATE=subdirs -SUBDIRS += quick/quicknanobrowser +SUBDIRS += webengine/quicknanobrowser qtHaveModule(widgets) { SUBDIRS += \ - widgets/browser \ - widgets/fancybrowser + webenginewidgets/browser \ + webenginewidgets/fancybrowser } diff --git a/examples/quick/quicknanobrowser/ContextMenuExtras.qml b/examples/webengine/quicknanobrowser/ContextMenuExtras.qml index cf54e9ba0..cf54e9ba0 100644 --- a/examples/quick/quicknanobrowser/ContextMenuExtras.qml +++ b/examples/webengine/quicknanobrowser/ContextMenuExtras.qml diff --git a/examples/quick/quicknanobrowser/icons/go-next.png b/examples/webengine/quicknanobrowser/icons/go-next.png Binary files differindex 6f3f65d33..6f3f65d33 100644 --- a/examples/quick/quicknanobrowser/icons/go-next.png +++ b/examples/webengine/quicknanobrowser/icons/go-next.png diff --git a/examples/quick/quicknanobrowser/icons/go-previous.png b/examples/webengine/quicknanobrowser/icons/go-previous.png Binary files differindex 93be3d1ee..93be3d1ee 100644 --- a/examples/quick/quicknanobrowser/icons/go-previous.png +++ b/examples/webengine/quicknanobrowser/icons/go-previous.png diff --git a/examples/quick/quicknanobrowser/icons/process-stop.png b/examples/webengine/quicknanobrowser/icons/process-stop.png Binary files differindex b68290bf1..b68290bf1 100644 --- a/examples/quick/quicknanobrowser/icons/process-stop.png +++ b/examples/webengine/quicknanobrowser/icons/process-stop.png diff --git a/examples/quick/quicknanobrowser/icons/view-refresh.png b/examples/webengine/quicknanobrowser/icons/view-refresh.png Binary files differindex cab4d02c7..cab4d02c7 100644 --- a/examples/quick/quicknanobrowser/icons/view-refresh.png +++ b/examples/webengine/quicknanobrowser/icons/view-refresh.png diff --git a/examples/quick/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp index 6c2f91de6..6c2f91de6 100644 --- a/examples/quick/quicknanobrowser/main.cpp +++ b/examples/webengine/quicknanobrowser/main.cpp diff --git a/examples/quick/quicknanobrowser/quicknanobrowser.pro b/examples/webengine/quicknanobrowser/quicknanobrowser.pro index b07bd4e51..0ea2e60e2 100644 --- a/examples/quick/quicknanobrowser/quicknanobrowser.pro +++ b/examples/webengine/quicknanobrowser/quicknanobrowser.pro @@ -20,5 +20,5 @@ qtHaveModule(widgets) { QT += widgets # QApplication is required to get native styling with QtQuickControls } -target.path = $$[QT_INSTALL_EXAMPLES]/quick/quicknanobrowser +target.path = $$[QT_INSTALL_EXAMPLES]/webengine/quicknanobrowser INSTALLS += target diff --git a/examples/quick/quicknanobrowser/quickwindow.cpp b/examples/webengine/quicknanobrowser/quickwindow.cpp index ec7b6f94a..ec7b6f94a 100644 --- a/examples/quick/quicknanobrowser/quickwindow.cpp +++ b/examples/webengine/quicknanobrowser/quickwindow.cpp diff --git a/examples/quick/quicknanobrowser/quickwindow.h b/examples/webengine/quicknanobrowser/quickwindow.h index ed25a23b8..ed25a23b8 100644 --- a/examples/quick/quicknanobrowser/quickwindow.h +++ b/examples/webengine/quicknanobrowser/quickwindow.h diff --git a/examples/quick/quicknanobrowser/quickwindow.qml b/examples/webengine/quicknanobrowser/quickwindow.qml index 183e41f4f..183e41f4f 100644 --- a/examples/quick/quicknanobrowser/quickwindow.qml +++ b/examples/webengine/quicknanobrowser/quickwindow.qml diff --git a/examples/quick/quicknanobrowser/resources.qrc b/examples/webengine/quicknanobrowser/resources.qrc index 1befb4fd1..1befb4fd1 100644 --- a/examples/quick/quicknanobrowser/resources.qrc +++ b/examples/webengine/quicknanobrowser/resources.qrc diff --git a/examples/quick/quicknanobrowser/util.h b/examples/webengine/quicknanobrowser/util.h index ea0ae8b2e..ea0ae8b2e 100644 --- a/examples/quick/quicknanobrowser/util.h +++ b/examples/webengine/quicknanobrowser/util.h diff --git a/examples/widgets/browser/Info_mac.plist b/examples/webenginewidgets/browser/Info_mac.plist index 87435b2b6..87435b2b6 100644 --- a/examples/widgets/browser/Info_mac.plist +++ b/examples/webenginewidgets/browser/Info_mac.plist diff --git a/examples/widgets/browser/addbookmarkdialog.ui b/examples/webenginewidgets/browser/addbookmarkdialog.ui index 3460d7bb8..3460d7bb8 100644 --- a/examples/widgets/browser/addbookmarkdialog.ui +++ b/examples/webenginewidgets/browser/addbookmarkdialog.ui diff --git a/examples/widgets/browser/autosaver.cpp b/examples/webenginewidgets/browser/autosaver.cpp index a6efa4ca1..a6efa4ca1 100644 --- a/examples/widgets/browser/autosaver.cpp +++ b/examples/webenginewidgets/browser/autosaver.cpp diff --git a/examples/widgets/browser/autosaver.h b/examples/webenginewidgets/browser/autosaver.h index cf499b066..cf499b066 100644 --- a/examples/widgets/browser/autosaver.h +++ b/examples/webenginewidgets/browser/autosaver.h diff --git a/examples/widgets/browser/bookmarks.cpp b/examples/webenginewidgets/browser/bookmarks.cpp index adc35bd50..adc35bd50 100644 --- a/examples/widgets/browser/bookmarks.cpp +++ b/examples/webenginewidgets/browser/bookmarks.cpp diff --git a/examples/widgets/browser/bookmarks.h b/examples/webenginewidgets/browser/bookmarks.h index be29666df..be29666df 100644 --- a/examples/widgets/browser/bookmarks.h +++ b/examples/webenginewidgets/browser/bookmarks.h diff --git a/examples/widgets/browser/bookmarks.ui b/examples/webenginewidgets/browser/bookmarks.ui index c893e941d..c893e941d 100644 --- a/examples/widgets/browser/bookmarks.ui +++ b/examples/webenginewidgets/browser/bookmarks.ui diff --git a/examples/widgets/browser/browser.icns b/examples/webenginewidgets/browser/browser.icns Binary files differindex f591ae48a..f591ae48a 100644 --- a/examples/widgets/browser/browser.icns +++ b/examples/webenginewidgets/browser/browser.icns diff --git a/examples/widgets/browser/browser.ico b/examples/webenginewidgets/browser/browser.ico Binary files differindex 7f9be934d..7f9be934d 100644 --- a/examples/widgets/browser/browser.ico +++ b/examples/webenginewidgets/browser/browser.ico diff --git a/examples/widgets/browser/browser.pro b/examples/webenginewidgets/browser/browser.pro index 050e9fa83..b40c745b8 100644 --- a/examples/widgets/browser/browser.pro +++ b/examples/webenginewidgets/browser/browser.pro @@ -99,5 +99,5 @@ wince*: { EXAMPLE_FILES = Info_mac.plist browser.icns browser.ico browser.rc # install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/browser +target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/browser INSTALLS += target diff --git a/examples/widgets/browser/browser.rc b/examples/webenginewidgets/browser/browser.rc index 39e17e973..39e17e973 100644 --- a/examples/widgets/browser/browser.rc +++ b/examples/webenginewidgets/browser/browser.rc diff --git a/examples/widgets/browser/browserapplication.cpp b/examples/webenginewidgets/browser/browserapplication.cpp index da96b65b9..da96b65b9 100644 --- a/examples/widgets/browser/browserapplication.cpp +++ b/examples/webenginewidgets/browser/browserapplication.cpp diff --git a/examples/widgets/browser/browserapplication.h b/examples/webenginewidgets/browser/browserapplication.h index b17f1cea5..b17f1cea5 100644 --- a/examples/widgets/browser/browserapplication.h +++ b/examples/webenginewidgets/browser/browserapplication.h diff --git a/examples/widgets/browser/browsermainwindow.cpp b/examples/webenginewidgets/browser/browsermainwindow.cpp index 3cee14e9e..3cee14e9e 100644 --- a/examples/widgets/browser/browsermainwindow.cpp +++ b/examples/webenginewidgets/browser/browsermainwindow.cpp diff --git a/examples/widgets/browser/browsermainwindow.h b/examples/webenginewidgets/browser/browsermainwindow.h index 3c3df9117..3c3df9117 100644 --- a/examples/widgets/browser/browsermainwindow.h +++ b/examples/webenginewidgets/browser/browsermainwindow.h diff --git a/examples/widgets/browser/chasewidget.cpp b/examples/webenginewidgets/browser/chasewidget.cpp index c34dde739..c34dde739 100644 --- a/examples/widgets/browser/chasewidget.cpp +++ b/examples/webenginewidgets/browser/chasewidget.cpp diff --git a/examples/widgets/browser/chasewidget.h b/examples/webenginewidgets/browser/chasewidget.h index 2c57d08ac..2c57d08ac 100644 --- a/examples/widgets/browser/chasewidget.h +++ b/examples/webenginewidgets/browser/chasewidget.h diff --git a/examples/widgets/browser/cookiejar.cpp b/examples/webenginewidgets/browser/cookiejar.cpp index 0b94d9903..0b94d9903 100644 --- a/examples/widgets/browser/cookiejar.cpp +++ b/examples/webenginewidgets/browser/cookiejar.cpp diff --git a/examples/widgets/browser/cookiejar.h b/examples/webenginewidgets/browser/cookiejar.h index 1cc7800e1..1cc7800e1 100644 --- a/examples/widgets/browser/cookiejar.h +++ b/examples/webenginewidgets/browser/cookiejar.h diff --git a/examples/widgets/browser/cookies.ui b/examples/webenginewidgets/browser/cookies.ui index c4bccc548..c4bccc548 100644 --- a/examples/widgets/browser/cookies.ui +++ b/examples/webenginewidgets/browser/cookies.ui diff --git a/examples/widgets/browser/cookiesexceptions.ui b/examples/webenginewidgets/browser/cookiesexceptions.ui index 3d9ef6241..3d9ef6241 100644 --- a/examples/widgets/browser/cookiesexceptions.ui +++ b/examples/webenginewidgets/browser/cookiesexceptions.ui diff --git a/examples/widgets/browser/data/addtab.png b/examples/webenginewidgets/browser/data/addtab.png Binary files differindex 20928fb40..20928fb40 100644 --- a/examples/widgets/browser/data/addtab.png +++ b/examples/webenginewidgets/browser/data/addtab.png diff --git a/examples/widgets/browser/data/browser.svg b/examples/webenginewidgets/browser/data/browser.svg index 8795187b1..8795187b1 100644 --- a/examples/widgets/browser/data/browser.svg +++ b/examples/webenginewidgets/browser/data/browser.svg diff --git a/examples/widgets/browser/data/closetab.png b/examples/webenginewidgets/browser/data/closetab.png Binary files differindex ab9d669ee..ab9d669ee 100644 --- a/examples/widgets/browser/data/closetab.png +++ b/examples/webenginewidgets/browser/data/closetab.png diff --git a/examples/widgets/browser/data/data.qrc b/examples/webenginewidgets/browser/data/data.qrc index c7d0294c1..c7d0294c1 100644 --- a/examples/widgets/browser/data/data.qrc +++ b/examples/webenginewidgets/browser/data/data.qrc diff --git a/examples/widgets/browser/data/defaultbookmarks.xbel b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel index 7a95e36b3..7a95e36b3 100644 --- a/examples/widgets/browser/data/defaultbookmarks.xbel +++ b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel diff --git a/examples/widgets/browser/data/defaulticon.png b/examples/webenginewidgets/browser/data/defaulticon.png Binary files differindex 01a0920c9..01a0920c9 100644 --- a/examples/widgets/browser/data/defaulticon.png +++ b/examples/webenginewidgets/browser/data/defaulticon.png diff --git a/examples/widgets/browser/data/history.png b/examples/webenginewidgets/browser/data/history.png Binary files differindex 552a1cbd8..552a1cbd8 100644 --- a/examples/widgets/browser/data/history.png +++ b/examples/webenginewidgets/browser/data/history.png diff --git a/examples/widgets/browser/data/loading.gif b/examples/webenginewidgets/browser/data/loading.gif Binary files differindex c1545eb0e..c1545eb0e 100644 --- a/examples/widgets/browser/data/loading.gif +++ b/examples/webenginewidgets/browser/data/loading.gif diff --git a/examples/widgets/browser/doc/images/browser-demo.png b/examples/webenginewidgets/browser/doc/images/browser-demo.png Binary files differindex 09d065095..09d065095 100644 --- a/examples/widgets/browser/doc/images/browser-demo.png +++ b/examples/webenginewidgets/browser/doc/images/browser-demo.png diff --git a/examples/widgets/browser/doc/src/browser.qdoc b/examples/webenginewidgets/browser/doc/src/browser.qdoc index 4e53de38f..4e53de38f 100644 --- a/examples/widgets/browser/doc/src/browser.qdoc +++ b/examples/webenginewidgets/browser/doc/src/browser.qdoc diff --git a/examples/widgets/browser/downloaditem.ui b/examples/webenginewidgets/browser/downloaditem.ui index 4a0a0fd9a..4a0a0fd9a 100644 --- a/examples/widgets/browser/downloaditem.ui +++ b/examples/webenginewidgets/browser/downloaditem.ui diff --git a/examples/widgets/browser/downloadmanager.cpp b/examples/webenginewidgets/browser/downloadmanager.cpp index 6f4c6c8ad..6f4c6c8ad 100644 --- a/examples/widgets/browser/downloadmanager.cpp +++ b/examples/webenginewidgets/browser/downloadmanager.cpp diff --git a/examples/widgets/browser/downloadmanager.h b/examples/webenginewidgets/browser/downloadmanager.h index 072e99efd..072e99efd 100644 --- a/examples/widgets/browser/downloadmanager.h +++ b/examples/webenginewidgets/browser/downloadmanager.h diff --git a/examples/widgets/browser/downloads.ui b/examples/webenginewidgets/browser/downloads.ui index a2e256935..a2e256935 100644 --- a/examples/widgets/browser/downloads.ui +++ b/examples/webenginewidgets/browser/downloads.ui diff --git a/examples/widgets/browser/edittableview.cpp b/examples/webenginewidgets/browser/edittableview.cpp index 71d9b5706..71d9b5706 100644 --- a/examples/widgets/browser/edittableview.cpp +++ b/examples/webenginewidgets/browser/edittableview.cpp diff --git a/examples/widgets/browser/edittableview.h b/examples/webenginewidgets/browser/edittableview.h index 1c865ad42..1c865ad42 100644 --- a/examples/widgets/browser/edittableview.h +++ b/examples/webenginewidgets/browser/edittableview.h diff --git a/examples/widgets/browser/edittreeview.cpp b/examples/webenginewidgets/browser/edittreeview.cpp index 5b8007856..5b8007856 100644 --- a/examples/widgets/browser/edittreeview.cpp +++ b/examples/webenginewidgets/browser/edittreeview.cpp diff --git a/examples/widgets/browser/edittreeview.h b/examples/webenginewidgets/browser/edittreeview.h index 4159812a6..4159812a6 100644 --- a/examples/widgets/browser/edittreeview.h +++ b/examples/webenginewidgets/browser/edittreeview.h diff --git a/examples/widgets/browser/history.cpp b/examples/webenginewidgets/browser/history.cpp index 9d599f876..9d599f876 100644 --- a/examples/widgets/browser/history.cpp +++ b/examples/webenginewidgets/browser/history.cpp diff --git a/examples/widgets/browser/history.h b/examples/webenginewidgets/browser/history.h index 4006f3415..4006f3415 100644 --- a/examples/widgets/browser/history.h +++ b/examples/webenginewidgets/browser/history.h diff --git a/examples/widgets/browser/history.ui b/examples/webenginewidgets/browser/history.ui index 0944940e7..0944940e7 100644 --- a/examples/widgets/browser/history.ui +++ b/examples/webenginewidgets/browser/history.ui diff --git a/examples/widgets/browser/htmls/htmls.qrc b/examples/webenginewidgets/browser/htmls/htmls.qrc index 03b256ccb..03b256ccb 100644 --- a/examples/widgets/browser/htmls/htmls.qrc +++ b/examples/webenginewidgets/browser/htmls/htmls.qrc diff --git a/examples/widgets/browser/htmls/notfound.html b/examples/webenginewidgets/browser/htmls/notfound.html index e89845aa6..e89845aa6 100644 --- a/examples/widgets/browser/htmls/notfound.html +++ b/examples/webenginewidgets/browser/htmls/notfound.html diff --git a/examples/widgets/browser/main.cpp b/examples/webenginewidgets/browser/main.cpp index 9baf01f42..9baf01f42 100644 --- a/examples/widgets/browser/main.cpp +++ b/examples/webenginewidgets/browser/main.cpp diff --git a/examples/widgets/browser/modelmenu.cpp b/examples/webenginewidgets/browser/modelmenu.cpp index 56453b080..56453b080 100644 --- a/examples/widgets/browser/modelmenu.cpp +++ b/examples/webenginewidgets/browser/modelmenu.cpp diff --git a/examples/widgets/browser/modelmenu.h b/examples/webenginewidgets/browser/modelmenu.h index 4045a7758..4045a7758 100644 --- a/examples/widgets/browser/modelmenu.h +++ b/examples/webenginewidgets/browser/modelmenu.h diff --git a/examples/widgets/browser/networkaccessmanager.cpp b/examples/webenginewidgets/browser/networkaccessmanager.cpp index a7127ade6..a7127ade6 100644 --- a/examples/widgets/browser/networkaccessmanager.cpp +++ b/examples/webenginewidgets/browser/networkaccessmanager.cpp diff --git a/examples/widgets/browser/networkaccessmanager.h b/examples/webenginewidgets/browser/networkaccessmanager.h index 54c24f86e..54c24f86e 100644 --- a/examples/widgets/browser/networkaccessmanager.h +++ b/examples/webenginewidgets/browser/networkaccessmanager.h diff --git a/examples/widgets/browser/passworddialog.ui b/examples/webenginewidgets/browser/passworddialog.ui index 7c1665867..7c1665867 100644 --- a/examples/widgets/browser/passworddialog.ui +++ b/examples/webenginewidgets/browser/passworddialog.ui diff --git a/examples/widgets/browser/proxy.ui b/examples/webenginewidgets/browser/proxy.ui index 62a8be627..62a8be627 100644 --- a/examples/widgets/browser/proxy.ui +++ b/examples/webenginewidgets/browser/proxy.ui diff --git a/examples/widgets/browser/searchlineedit.cpp b/examples/webenginewidgets/browser/searchlineedit.cpp index 0d387da4b..0d387da4b 100644 --- a/examples/widgets/browser/searchlineedit.cpp +++ b/examples/webenginewidgets/browser/searchlineedit.cpp diff --git a/examples/widgets/browser/searchlineedit.h b/examples/webenginewidgets/browser/searchlineedit.h index e01fcbff2..e01fcbff2 100644 --- a/examples/widgets/browser/searchlineedit.h +++ b/examples/webenginewidgets/browser/searchlineedit.h diff --git a/examples/widgets/browser/settings.cpp b/examples/webenginewidgets/browser/settings.cpp index 6838c19aa..6838c19aa 100644 --- a/examples/widgets/browser/settings.cpp +++ b/examples/webenginewidgets/browser/settings.cpp diff --git a/examples/widgets/browser/settings.h b/examples/webenginewidgets/browser/settings.h index 0858e0023..0858e0023 100644 --- a/examples/widgets/browser/settings.h +++ b/examples/webenginewidgets/browser/settings.h diff --git a/examples/widgets/browser/settings.ui b/examples/webenginewidgets/browser/settings.ui index 3491ce0b0..3491ce0b0 100644 --- a/examples/widgets/browser/settings.ui +++ b/examples/webenginewidgets/browser/settings.ui diff --git a/examples/widgets/browser/squeezelabel.cpp b/examples/webenginewidgets/browser/squeezelabel.cpp index c40fe97da..c40fe97da 100644 --- a/examples/widgets/browser/squeezelabel.cpp +++ b/examples/webenginewidgets/browser/squeezelabel.cpp diff --git a/examples/widgets/browser/squeezelabel.h b/examples/webenginewidgets/browser/squeezelabel.h index 6df84179a..6df84179a 100644 --- a/examples/widgets/browser/squeezelabel.h +++ b/examples/webenginewidgets/browser/squeezelabel.h diff --git a/examples/widgets/browser/tabwidget.cpp b/examples/webenginewidgets/browser/tabwidget.cpp index 3c71b2d53..3c71b2d53 100644 --- a/examples/widgets/browser/tabwidget.cpp +++ b/examples/webenginewidgets/browser/tabwidget.cpp diff --git a/examples/widgets/browser/tabwidget.h b/examples/webenginewidgets/browser/tabwidget.h index e5e1cb606..e5e1cb606 100644 --- a/examples/widgets/browser/tabwidget.h +++ b/examples/webenginewidgets/browser/tabwidget.h diff --git a/examples/widgets/browser/toolbarsearch.cpp b/examples/webenginewidgets/browser/toolbarsearch.cpp index d6d1ec1da..d6d1ec1da 100644 --- a/examples/widgets/browser/toolbarsearch.cpp +++ b/examples/webenginewidgets/browser/toolbarsearch.cpp diff --git a/examples/widgets/browser/toolbarsearch.h b/examples/webenginewidgets/browser/toolbarsearch.h index 1189785db..1189785db 100644 --- a/examples/widgets/browser/toolbarsearch.h +++ b/examples/webenginewidgets/browser/toolbarsearch.h diff --git a/examples/widgets/browser/urllineedit.cpp b/examples/webenginewidgets/browser/urllineedit.cpp index 47828d95f..47828d95f 100644 --- a/examples/widgets/browser/urllineedit.cpp +++ b/examples/webenginewidgets/browser/urllineedit.cpp diff --git a/examples/widgets/browser/urllineedit.h b/examples/webenginewidgets/browser/urllineedit.h index c30f40b57..c30f40b57 100644 --- a/examples/widgets/browser/urllineedit.h +++ b/examples/webenginewidgets/browser/urllineedit.h diff --git a/examples/widgets/browser/webview.cpp b/examples/webenginewidgets/browser/webview.cpp index 193cb4797..193cb4797 100644 --- a/examples/widgets/browser/webview.cpp +++ b/examples/webenginewidgets/browser/webview.cpp diff --git a/examples/widgets/browser/webview.h b/examples/webenginewidgets/browser/webview.h index 2d3ec50cc..2d3ec50cc 100644 --- a/examples/widgets/browser/webview.h +++ b/examples/webenginewidgets/browser/webview.h diff --git a/examples/widgets/browser/xbel.cpp b/examples/webenginewidgets/browser/xbel.cpp index ae84a6a37..ae84a6a37 100644 --- a/examples/widgets/browser/xbel.cpp +++ b/examples/webenginewidgets/browser/xbel.cpp diff --git a/examples/widgets/browser/xbel.h b/examples/webenginewidgets/browser/xbel.h index 8ee9558ef..8ee9558ef 100644 --- a/examples/widgets/browser/xbel.h +++ b/examples/webenginewidgets/browser/xbel.h diff --git a/examples/widgets/fancybrowser/doc/images/fancybrowser-example.png b/examples/webenginewidgets/fancybrowser/doc/images/fancybrowser-example.png Binary files differindex 717ac9ddc..717ac9ddc 100644 --- a/examples/widgets/fancybrowser/doc/images/fancybrowser-example.png +++ b/examples/webenginewidgets/fancybrowser/doc/images/fancybrowser-example.png diff --git a/examples/widgets/fancybrowser/doc/src/fancybrowser.qdoc b/examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc index c1de06332..c1de06332 100644 --- a/examples/widgets/fancybrowser/doc/src/fancybrowser.qdoc +++ b/examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc diff --git a/examples/widgets/fancybrowser/fancybrowser.pro b/examples/webenginewidgets/fancybrowser/fancybrowser.pro index eb5e5a34c..c530f74b8 100644 --- a/examples/widgets/fancybrowser/fancybrowser.pro +++ b/examples/webenginewidgets/fancybrowser/fancybrowser.pro @@ -8,5 +8,5 @@ SOURCES = main.cpp \ RESOURCES = jquery.qrc # install -#target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/fancybrowser +#target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/fancybrowser #INSTALLS += target diff --git a/examples/widgets/fancybrowser/jquery.min.js b/examples/webenginewidgets/fancybrowser/jquery.min.js index b1ae21d8b..b1ae21d8b 100644 --- a/examples/widgets/fancybrowser/jquery.min.js +++ b/examples/webenginewidgets/fancybrowser/jquery.min.js diff --git a/examples/widgets/fancybrowser/jquery.qrc b/examples/webenginewidgets/fancybrowser/jquery.qrc index 1022d682f..1022d682f 100644 --- a/examples/widgets/fancybrowser/jquery.qrc +++ b/examples/webenginewidgets/fancybrowser/jquery.qrc diff --git a/examples/widgets/fancybrowser/main.cpp b/examples/webenginewidgets/fancybrowser/main.cpp index 451f247f3..451f247f3 100644 --- a/examples/widgets/fancybrowser/main.cpp +++ b/examples/webenginewidgets/fancybrowser/main.cpp diff --git a/examples/widgets/fancybrowser/mainwindow.cpp b/examples/webenginewidgets/fancybrowser/mainwindow.cpp index 3366d2006..3366d2006 100644 --- a/examples/widgets/fancybrowser/mainwindow.cpp +++ b/examples/webenginewidgets/fancybrowser/mainwindow.cpp diff --git a/examples/widgets/fancybrowser/mainwindow.h b/examples/webenginewidgets/fancybrowser/mainwindow.h index 5f33bdf96..5f33bdf96 100644 --- a/examples/widgets/fancybrowser/mainwindow.h +++ b/examples/webenginewidgets/fancybrowser/mainwindow.h |