diff --git a/examples/examples.pro b/examples/examples.pro index 4952e0b15c48761abbfff714203f089e06b20277..7940e289de2f5fe3b2892c4caadb75f43a1fff76 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 similarity index 100% rename from examples/quick/quicknanobrowser/ContextMenuExtras.qml rename to examples/webengine/quicknanobrowser/ContextMenuExtras.qml diff --git a/examples/quick/quicknanobrowser/icons/go-next.png b/examples/webengine/quicknanobrowser/icons/go-next.png similarity index 100% rename from examples/quick/quicknanobrowser/icons/go-next.png rename to 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 similarity index 100% rename from examples/quick/quicknanobrowser/icons/go-previous.png rename to 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 similarity index 100% rename from examples/quick/quicknanobrowser/icons/process-stop.png rename to 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 similarity index 100% rename from examples/quick/quicknanobrowser/icons/view-refresh.png rename to examples/webengine/quicknanobrowser/icons/view-refresh.png diff --git a/examples/quick/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp similarity index 100% rename from examples/quick/quicknanobrowser/main.cpp rename to examples/webengine/quicknanobrowser/main.cpp diff --git a/examples/quick/quicknanobrowser/quicknanobrowser.pro b/examples/webengine/quicknanobrowser/quicknanobrowser.pro similarity index 87% rename from examples/quick/quicknanobrowser/quicknanobrowser.pro rename to examples/webengine/quicknanobrowser/quicknanobrowser.pro index b07bd4e51130cb99d5702747bbede366c95eab69..0ea2e60e219ce16cabbda922d6ea63c23026e1fc 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 similarity index 100% rename from examples/quick/quicknanobrowser/quickwindow.cpp rename to examples/webengine/quicknanobrowser/quickwindow.cpp diff --git a/examples/quick/quicknanobrowser/quickwindow.h b/examples/webengine/quicknanobrowser/quickwindow.h similarity index 100% rename from examples/quick/quicknanobrowser/quickwindow.h rename to examples/webengine/quicknanobrowser/quickwindow.h diff --git a/examples/quick/quicknanobrowser/quickwindow.qml b/examples/webengine/quicknanobrowser/quickwindow.qml similarity index 100% rename from examples/quick/quicknanobrowser/quickwindow.qml rename to examples/webengine/quicknanobrowser/quickwindow.qml diff --git a/examples/quick/quicknanobrowser/resources.qrc b/examples/webengine/quicknanobrowser/resources.qrc similarity index 100% rename from examples/quick/quicknanobrowser/resources.qrc rename to examples/webengine/quicknanobrowser/resources.qrc diff --git a/examples/quick/quicknanobrowser/util.h b/examples/webengine/quicknanobrowser/util.h similarity index 100% rename from examples/quick/quicknanobrowser/util.h rename to examples/webengine/quicknanobrowser/util.h diff --git a/examples/widgets/browser/Info_mac.plist b/examples/webenginewidgets/browser/Info_mac.plist similarity index 100% rename from examples/widgets/browser/Info_mac.plist rename to examples/webenginewidgets/browser/Info_mac.plist diff --git a/examples/widgets/browser/addbookmarkdialog.ui b/examples/webenginewidgets/browser/addbookmarkdialog.ui similarity index 100% rename from examples/widgets/browser/addbookmarkdialog.ui rename to examples/webenginewidgets/browser/addbookmarkdialog.ui diff --git a/examples/widgets/browser/autosaver.cpp b/examples/webenginewidgets/browser/autosaver.cpp similarity index 100% rename from examples/widgets/browser/autosaver.cpp rename to examples/webenginewidgets/browser/autosaver.cpp diff --git a/examples/widgets/browser/autosaver.h b/examples/webenginewidgets/browser/autosaver.h similarity index 100% rename from examples/widgets/browser/autosaver.h rename to examples/webenginewidgets/browser/autosaver.h diff --git a/examples/widgets/browser/bookmarks.cpp b/examples/webenginewidgets/browser/bookmarks.cpp similarity index 100% rename from examples/widgets/browser/bookmarks.cpp rename to examples/webenginewidgets/browser/bookmarks.cpp diff --git a/examples/widgets/browser/bookmarks.h b/examples/webenginewidgets/browser/bookmarks.h similarity index 100% rename from examples/widgets/browser/bookmarks.h rename to examples/webenginewidgets/browser/bookmarks.h diff --git a/examples/widgets/browser/bookmarks.ui b/examples/webenginewidgets/browser/bookmarks.ui similarity index 100% rename from examples/widgets/browser/bookmarks.ui rename to examples/webenginewidgets/browser/bookmarks.ui diff --git a/examples/widgets/browser/browser.icns b/examples/webenginewidgets/browser/browser.icns similarity index 100% rename from examples/widgets/browser/browser.icns rename to examples/webenginewidgets/browser/browser.icns diff --git a/examples/widgets/browser/browser.ico b/examples/webenginewidgets/browser/browser.ico similarity index 100% rename from examples/widgets/browser/browser.ico rename to examples/webenginewidgets/browser/browser.ico diff --git a/examples/widgets/browser/browser.pro b/examples/webenginewidgets/browser/browser.pro similarity index 96% rename from examples/widgets/browser/browser.pro rename to examples/webenginewidgets/browser/browser.pro index 050e9fa83c2a38eca717bdb046e0daf95b71e240..b40c745b87a9af9360b34fc09c6c0f5f67aded09 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 similarity index 100% rename from examples/widgets/browser/browser.rc rename to examples/webenginewidgets/browser/browser.rc diff --git a/examples/widgets/browser/browserapplication.cpp b/examples/webenginewidgets/browser/browserapplication.cpp similarity index 100% rename from examples/widgets/browser/browserapplication.cpp rename to examples/webenginewidgets/browser/browserapplication.cpp diff --git a/examples/widgets/browser/browserapplication.h b/examples/webenginewidgets/browser/browserapplication.h similarity index 100% rename from examples/widgets/browser/browserapplication.h rename to examples/webenginewidgets/browser/browserapplication.h diff --git a/examples/widgets/browser/browsermainwindow.cpp b/examples/webenginewidgets/browser/browsermainwindow.cpp similarity index 100% rename from examples/widgets/browser/browsermainwindow.cpp rename to examples/webenginewidgets/browser/browsermainwindow.cpp diff --git a/examples/widgets/browser/browsermainwindow.h b/examples/webenginewidgets/browser/browsermainwindow.h similarity index 100% rename from examples/widgets/browser/browsermainwindow.h rename to examples/webenginewidgets/browser/browsermainwindow.h diff --git a/examples/widgets/browser/chasewidget.cpp b/examples/webenginewidgets/browser/chasewidget.cpp similarity index 100% rename from examples/widgets/browser/chasewidget.cpp rename to examples/webenginewidgets/browser/chasewidget.cpp diff --git a/examples/widgets/browser/chasewidget.h b/examples/webenginewidgets/browser/chasewidget.h similarity index 100% rename from examples/widgets/browser/chasewidget.h rename to examples/webenginewidgets/browser/chasewidget.h diff --git a/examples/widgets/browser/cookiejar.cpp b/examples/webenginewidgets/browser/cookiejar.cpp similarity index 100% rename from examples/widgets/browser/cookiejar.cpp rename to examples/webenginewidgets/browser/cookiejar.cpp diff --git a/examples/widgets/browser/cookiejar.h b/examples/webenginewidgets/browser/cookiejar.h similarity index 100% rename from examples/widgets/browser/cookiejar.h rename to examples/webenginewidgets/browser/cookiejar.h diff --git a/examples/widgets/browser/cookies.ui b/examples/webenginewidgets/browser/cookies.ui similarity index 100% rename from examples/widgets/browser/cookies.ui rename to examples/webenginewidgets/browser/cookies.ui diff --git a/examples/widgets/browser/cookiesexceptions.ui b/examples/webenginewidgets/browser/cookiesexceptions.ui similarity index 100% rename from examples/widgets/browser/cookiesexceptions.ui rename to examples/webenginewidgets/browser/cookiesexceptions.ui diff --git a/examples/widgets/browser/data/addtab.png b/examples/webenginewidgets/browser/data/addtab.png similarity index 100% rename from examples/widgets/browser/data/addtab.png rename to examples/webenginewidgets/browser/data/addtab.png diff --git a/examples/widgets/browser/data/browser.svg b/examples/webenginewidgets/browser/data/browser.svg similarity index 100% rename from examples/widgets/browser/data/browser.svg rename to examples/webenginewidgets/browser/data/browser.svg diff --git a/examples/widgets/browser/data/closetab.png b/examples/webenginewidgets/browser/data/closetab.png similarity index 100% rename from examples/widgets/browser/data/closetab.png rename to examples/webenginewidgets/browser/data/closetab.png diff --git a/examples/widgets/browser/data/data.qrc b/examples/webenginewidgets/browser/data/data.qrc similarity index 100% rename from examples/widgets/browser/data/data.qrc rename to examples/webenginewidgets/browser/data/data.qrc diff --git a/examples/widgets/browser/data/defaultbookmarks.xbel b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel similarity index 100% rename from examples/widgets/browser/data/defaultbookmarks.xbel rename to examples/webenginewidgets/browser/data/defaultbookmarks.xbel diff --git a/examples/widgets/browser/data/defaulticon.png b/examples/webenginewidgets/browser/data/defaulticon.png similarity index 100% rename from examples/widgets/browser/data/defaulticon.png rename to examples/webenginewidgets/browser/data/defaulticon.png diff --git a/examples/widgets/browser/data/history.png b/examples/webenginewidgets/browser/data/history.png similarity index 100% rename from examples/widgets/browser/data/history.png rename to examples/webenginewidgets/browser/data/history.png diff --git a/examples/widgets/browser/data/loading.gif b/examples/webenginewidgets/browser/data/loading.gif similarity index 100% rename from examples/widgets/browser/data/loading.gif rename to 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 similarity index 100% rename from examples/widgets/browser/doc/images/browser-demo.png rename to 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 similarity index 100% rename from examples/widgets/browser/doc/src/browser.qdoc rename to examples/webenginewidgets/browser/doc/src/browser.qdoc diff --git a/examples/widgets/browser/downloaditem.ui b/examples/webenginewidgets/browser/downloaditem.ui similarity index 100% rename from examples/widgets/browser/downloaditem.ui rename to examples/webenginewidgets/browser/downloaditem.ui diff --git a/examples/widgets/browser/downloadmanager.cpp b/examples/webenginewidgets/browser/downloadmanager.cpp similarity index 100% rename from examples/widgets/browser/downloadmanager.cpp rename to examples/webenginewidgets/browser/downloadmanager.cpp diff --git a/examples/widgets/browser/downloadmanager.h b/examples/webenginewidgets/browser/downloadmanager.h similarity index 100% rename from examples/widgets/browser/downloadmanager.h rename to examples/webenginewidgets/browser/downloadmanager.h diff --git a/examples/widgets/browser/downloads.ui b/examples/webenginewidgets/browser/downloads.ui similarity index 100% rename from examples/widgets/browser/downloads.ui rename to examples/webenginewidgets/browser/downloads.ui diff --git a/examples/widgets/browser/edittableview.cpp b/examples/webenginewidgets/browser/edittableview.cpp similarity index 100% rename from examples/widgets/browser/edittableview.cpp rename to examples/webenginewidgets/browser/edittableview.cpp diff --git a/examples/widgets/browser/edittableview.h b/examples/webenginewidgets/browser/edittableview.h similarity index 100% rename from examples/widgets/browser/edittableview.h rename to examples/webenginewidgets/browser/edittableview.h diff --git a/examples/widgets/browser/edittreeview.cpp b/examples/webenginewidgets/browser/edittreeview.cpp similarity index 100% rename from examples/widgets/browser/edittreeview.cpp rename to examples/webenginewidgets/browser/edittreeview.cpp diff --git a/examples/widgets/browser/edittreeview.h b/examples/webenginewidgets/browser/edittreeview.h similarity index 100% rename from examples/widgets/browser/edittreeview.h rename to examples/webenginewidgets/browser/edittreeview.h diff --git a/examples/widgets/browser/history.cpp b/examples/webenginewidgets/browser/history.cpp similarity index 100% rename from examples/widgets/browser/history.cpp rename to examples/webenginewidgets/browser/history.cpp diff --git a/examples/widgets/browser/history.h b/examples/webenginewidgets/browser/history.h similarity index 100% rename from examples/widgets/browser/history.h rename to examples/webenginewidgets/browser/history.h diff --git a/examples/widgets/browser/history.ui b/examples/webenginewidgets/browser/history.ui similarity index 100% rename from examples/widgets/browser/history.ui rename to examples/webenginewidgets/browser/history.ui diff --git a/examples/widgets/browser/htmls/htmls.qrc b/examples/webenginewidgets/browser/htmls/htmls.qrc similarity index 100% rename from examples/widgets/browser/htmls/htmls.qrc rename to examples/webenginewidgets/browser/htmls/htmls.qrc diff --git a/examples/widgets/browser/htmls/notfound.html b/examples/webenginewidgets/browser/htmls/notfound.html similarity index 100% rename from examples/widgets/browser/htmls/notfound.html rename to examples/webenginewidgets/browser/htmls/notfound.html diff --git a/examples/widgets/browser/main.cpp b/examples/webenginewidgets/browser/main.cpp similarity index 100% rename from examples/widgets/browser/main.cpp rename to examples/webenginewidgets/browser/main.cpp diff --git a/examples/widgets/browser/modelmenu.cpp b/examples/webenginewidgets/browser/modelmenu.cpp similarity index 100% rename from examples/widgets/browser/modelmenu.cpp rename to examples/webenginewidgets/browser/modelmenu.cpp diff --git a/examples/widgets/browser/modelmenu.h b/examples/webenginewidgets/browser/modelmenu.h similarity index 100% rename from examples/widgets/browser/modelmenu.h rename to examples/webenginewidgets/browser/modelmenu.h diff --git a/examples/widgets/browser/networkaccessmanager.cpp b/examples/webenginewidgets/browser/networkaccessmanager.cpp similarity index 100% rename from examples/widgets/browser/networkaccessmanager.cpp rename to examples/webenginewidgets/browser/networkaccessmanager.cpp diff --git a/examples/widgets/browser/networkaccessmanager.h b/examples/webenginewidgets/browser/networkaccessmanager.h similarity index 100% rename from examples/widgets/browser/networkaccessmanager.h rename to examples/webenginewidgets/browser/networkaccessmanager.h diff --git a/examples/widgets/browser/passworddialog.ui b/examples/webenginewidgets/browser/passworddialog.ui similarity index 100% rename from examples/widgets/browser/passworddialog.ui rename to examples/webenginewidgets/browser/passworddialog.ui diff --git a/examples/widgets/browser/proxy.ui b/examples/webenginewidgets/browser/proxy.ui similarity index 100% rename from examples/widgets/browser/proxy.ui rename to examples/webenginewidgets/browser/proxy.ui diff --git a/examples/widgets/browser/searchlineedit.cpp b/examples/webenginewidgets/browser/searchlineedit.cpp similarity index 100% rename from examples/widgets/browser/searchlineedit.cpp rename to examples/webenginewidgets/browser/searchlineedit.cpp diff --git a/examples/widgets/browser/searchlineedit.h b/examples/webenginewidgets/browser/searchlineedit.h similarity index 100% rename from examples/widgets/browser/searchlineedit.h rename to examples/webenginewidgets/browser/searchlineedit.h diff --git a/examples/widgets/browser/settings.cpp b/examples/webenginewidgets/browser/settings.cpp similarity index 100% rename from examples/widgets/browser/settings.cpp rename to examples/webenginewidgets/browser/settings.cpp diff --git a/examples/widgets/browser/settings.h b/examples/webenginewidgets/browser/settings.h similarity index 100% rename from examples/widgets/browser/settings.h rename to examples/webenginewidgets/browser/settings.h diff --git a/examples/widgets/browser/settings.ui b/examples/webenginewidgets/browser/settings.ui similarity index 100% rename from examples/widgets/browser/settings.ui rename to examples/webenginewidgets/browser/settings.ui diff --git a/examples/widgets/browser/squeezelabel.cpp b/examples/webenginewidgets/browser/squeezelabel.cpp similarity index 100% rename from examples/widgets/browser/squeezelabel.cpp rename to examples/webenginewidgets/browser/squeezelabel.cpp diff --git a/examples/widgets/browser/squeezelabel.h b/examples/webenginewidgets/browser/squeezelabel.h similarity index 100% rename from examples/widgets/browser/squeezelabel.h rename to examples/webenginewidgets/browser/squeezelabel.h diff --git a/examples/widgets/browser/tabwidget.cpp b/examples/webenginewidgets/browser/tabwidget.cpp similarity index 100% rename from examples/widgets/browser/tabwidget.cpp rename to examples/webenginewidgets/browser/tabwidget.cpp diff --git a/examples/widgets/browser/tabwidget.h b/examples/webenginewidgets/browser/tabwidget.h similarity index 100% rename from examples/widgets/browser/tabwidget.h rename to examples/webenginewidgets/browser/tabwidget.h diff --git a/examples/widgets/browser/toolbarsearch.cpp b/examples/webenginewidgets/browser/toolbarsearch.cpp similarity index 100% rename from examples/widgets/browser/toolbarsearch.cpp rename to examples/webenginewidgets/browser/toolbarsearch.cpp diff --git a/examples/widgets/browser/toolbarsearch.h b/examples/webenginewidgets/browser/toolbarsearch.h similarity index 100% rename from examples/widgets/browser/toolbarsearch.h rename to examples/webenginewidgets/browser/toolbarsearch.h diff --git a/examples/widgets/browser/urllineedit.cpp b/examples/webenginewidgets/browser/urllineedit.cpp similarity index 100% rename from examples/widgets/browser/urllineedit.cpp rename to examples/webenginewidgets/browser/urllineedit.cpp diff --git a/examples/widgets/browser/urllineedit.h b/examples/webenginewidgets/browser/urllineedit.h similarity index 100% rename from examples/widgets/browser/urllineedit.h rename to examples/webenginewidgets/browser/urllineedit.h diff --git a/examples/widgets/browser/webview.cpp b/examples/webenginewidgets/browser/webview.cpp similarity index 100% rename from examples/widgets/browser/webview.cpp rename to examples/webenginewidgets/browser/webview.cpp diff --git a/examples/widgets/browser/webview.h b/examples/webenginewidgets/browser/webview.h similarity index 100% rename from examples/widgets/browser/webview.h rename to examples/webenginewidgets/browser/webview.h diff --git a/examples/widgets/browser/xbel.cpp b/examples/webenginewidgets/browser/xbel.cpp similarity index 100% rename from examples/widgets/browser/xbel.cpp rename to examples/webenginewidgets/browser/xbel.cpp diff --git a/examples/widgets/browser/xbel.h b/examples/webenginewidgets/browser/xbel.h similarity index 100% rename from examples/widgets/browser/xbel.h rename to 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 similarity index 100% rename from examples/widgets/fancybrowser/doc/images/fancybrowser-example.png rename to 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 similarity index 100% rename from examples/widgets/fancybrowser/doc/src/fancybrowser.qdoc rename to examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc diff --git a/examples/widgets/fancybrowser/fancybrowser.pro b/examples/webenginewidgets/fancybrowser/fancybrowser.pro similarity index 73% rename from examples/widgets/fancybrowser/fancybrowser.pro rename to examples/webenginewidgets/fancybrowser/fancybrowser.pro index eb5e5a34c78db2f49f9533e068e6a56ff1a3e72a..c530f74b86ef98dba3a2ce96cb9f67c4d9fed1dc 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 similarity index 100% rename from examples/widgets/fancybrowser/jquery.min.js rename to examples/webenginewidgets/fancybrowser/jquery.min.js diff --git a/examples/widgets/fancybrowser/jquery.qrc b/examples/webenginewidgets/fancybrowser/jquery.qrc similarity index 100% rename from examples/widgets/fancybrowser/jquery.qrc rename to examples/webenginewidgets/fancybrowser/jquery.qrc diff --git a/examples/widgets/fancybrowser/main.cpp b/examples/webenginewidgets/fancybrowser/main.cpp similarity index 100% rename from examples/widgets/fancybrowser/main.cpp rename to examples/webenginewidgets/fancybrowser/main.cpp diff --git a/examples/widgets/fancybrowser/mainwindow.cpp b/examples/webenginewidgets/fancybrowser/mainwindow.cpp similarity index 100% rename from examples/widgets/fancybrowser/mainwindow.cpp rename to examples/webenginewidgets/fancybrowser/mainwindow.cpp diff --git a/examples/widgets/fancybrowser/mainwindow.h b/examples/webenginewidgets/fancybrowser/mainwindow.h similarity index 100% rename from examples/widgets/fancybrowser/mainwindow.h rename to examples/webenginewidgets/fancybrowser/mainwindow.h