From 482a89fb431da3430bdfd4a1f9a93d66b8254163 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Date: Mon, 10 Mar 2014 16:37:18 +0100 Subject: [PATCH] Rename example directories to match the source install destination To match other modules example directory structures we should deploy our examples in a directory matching the module name, webengine and webenginewidgets in our case. qmake uses the relative directory of each example up to the upper "examples" directory to decide where they will be deployed when running the sources install target. Change-Id: I59ce7ff8a30f98fad20064c7eecf72b784f1d275 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> --- examples/examples.pro | 6 +++--- .../quicknanobrowser/ContextMenuExtras.qml | 0 .../quicknanobrowser/icons/go-next.png | Bin .../quicknanobrowser/icons/go-previous.png | Bin .../quicknanobrowser/icons/process-stop.png | Bin .../quicknanobrowser/icons/view-refresh.png | Bin .../{quick => webengine}/quicknanobrowser/main.cpp | 0 .../quicknanobrowser/quicknanobrowser.pro | 2 +- .../quicknanobrowser/quickwindow.cpp | 0 .../quicknanobrowser/quickwindow.h | 0 .../quicknanobrowser/quickwindow.qml | 0 .../quicknanobrowser/resources.qrc | 0 .../{quick => webengine}/quicknanobrowser/util.h | 0 .../browser/Info_mac.plist | 0 .../browser/addbookmarkdialog.ui | 0 .../browser/autosaver.cpp | 0 .../browser/autosaver.h | 0 .../browser/bookmarks.cpp | 0 .../browser/bookmarks.h | 0 .../browser/bookmarks.ui | 0 .../browser/browser.icns | Bin .../browser/browser.ico | Bin .../browser/browser.pro | 2 +- .../browser/browser.rc | 0 .../browser/browserapplication.cpp | 0 .../browser/browserapplication.h | 0 .../browser/browsermainwindow.cpp | 0 .../browser/browsermainwindow.h | 0 .../browser/chasewidget.cpp | 0 .../browser/chasewidget.h | 0 .../browser/cookiejar.cpp | 0 .../browser/cookiejar.h | 0 .../browser/cookies.ui | 0 .../browser/cookiesexceptions.ui | 0 .../browser/data/addtab.png | Bin .../browser/data/browser.svg | 0 .../browser/data/closetab.png | Bin .../browser/data/data.qrc | 0 .../browser/data/defaultbookmarks.xbel | 0 .../browser/data/defaulticon.png | Bin .../browser/data/history.png | Bin .../browser/data/loading.gif | Bin .../browser/doc/images/browser-demo.png | Bin .../browser/doc/src/browser.qdoc | 0 .../browser/downloaditem.ui | 0 .../browser/downloadmanager.cpp | 0 .../browser/downloadmanager.h | 0 .../browser/downloads.ui | 0 .../browser/edittableview.cpp | 0 .../browser/edittableview.h | 0 .../browser/edittreeview.cpp | 0 .../browser/edittreeview.h | 0 .../browser/history.cpp | 0 .../{widgets => webenginewidgets}/browser/history.h | 0 .../browser/history.ui | 0 .../browser/htmls/htmls.qrc | 0 .../browser/htmls/notfound.html | 0 .../{widgets => webenginewidgets}/browser/main.cpp | 0 .../browser/modelmenu.cpp | 0 .../browser/modelmenu.h | 0 .../browser/networkaccessmanager.cpp | 0 .../browser/networkaccessmanager.h | 0 .../browser/passworddialog.ui | 0 .../{widgets => webenginewidgets}/browser/proxy.ui | 0 .../browser/searchlineedit.cpp | 0 .../browser/searchlineedit.h | 0 .../browser/settings.cpp | 0 .../browser/settings.h | 0 .../browser/settings.ui | 0 .../browser/squeezelabel.cpp | 0 .../browser/squeezelabel.h | 0 .../browser/tabwidget.cpp | 0 .../browser/tabwidget.h | 0 .../browser/toolbarsearch.cpp | 0 .../browser/toolbarsearch.h | 0 .../browser/urllineedit.cpp | 0 .../browser/urllineedit.h | 0 .../browser/webview.cpp | 0 .../{widgets => webenginewidgets}/browser/webview.h | 0 .../{widgets => webenginewidgets}/browser/xbel.cpp | 0 .../{widgets => webenginewidgets}/browser/xbel.h | 0 .../doc/images/fancybrowser-example.png | Bin .../fancybrowser/doc/src/fancybrowser.qdoc | 0 .../fancybrowser/fancybrowser.pro | 2 +- .../fancybrowser/jquery.min.js | 0 .../fancybrowser/jquery.qrc | 0 .../fancybrowser/main.cpp | 0 .../fancybrowser/mainwindow.cpp | 0 .../fancybrowser/mainwindow.h | 0 89 files changed, 6 insertions(+), 6 deletions(-) rename examples/{quick => webengine}/quicknanobrowser/ContextMenuExtras.qml (100%) rename examples/{quick => webengine}/quicknanobrowser/icons/go-next.png (100%) rename examples/{quick => webengine}/quicknanobrowser/icons/go-previous.png (100%) rename examples/{quick => webengine}/quicknanobrowser/icons/process-stop.png (100%) rename examples/{quick => webengine}/quicknanobrowser/icons/view-refresh.png (100%) rename examples/{quick => webengine}/quicknanobrowser/main.cpp (100%) rename examples/{quick => webengine}/quicknanobrowser/quicknanobrowser.pro (87%) rename examples/{quick => webengine}/quicknanobrowser/quickwindow.cpp (100%) rename examples/{quick => webengine}/quicknanobrowser/quickwindow.h (100%) rename examples/{quick => webengine}/quicknanobrowser/quickwindow.qml (100%) rename examples/{quick => webengine}/quicknanobrowser/resources.qrc (100%) rename examples/{quick => webengine}/quicknanobrowser/util.h (100%) rename examples/{widgets => webenginewidgets}/browser/Info_mac.plist (100%) rename examples/{widgets => webenginewidgets}/browser/addbookmarkdialog.ui (100%) rename examples/{widgets => webenginewidgets}/browser/autosaver.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/autosaver.h (100%) rename examples/{widgets => webenginewidgets}/browser/bookmarks.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/bookmarks.h (100%) rename examples/{widgets => webenginewidgets}/browser/bookmarks.ui (100%) rename examples/{widgets => webenginewidgets}/browser/browser.icns (100%) rename examples/{widgets => webenginewidgets}/browser/browser.ico (100%) rename examples/{widgets => webenginewidgets}/browser/browser.pro (96%) rename examples/{widgets => webenginewidgets}/browser/browser.rc (100%) rename examples/{widgets => webenginewidgets}/browser/browserapplication.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/browserapplication.h (100%) rename examples/{widgets => webenginewidgets}/browser/browsermainwindow.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/browsermainwindow.h (100%) rename examples/{widgets => webenginewidgets}/browser/chasewidget.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/chasewidget.h (100%) rename examples/{widgets => webenginewidgets}/browser/cookiejar.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/cookiejar.h (100%) rename examples/{widgets => webenginewidgets}/browser/cookies.ui (100%) rename examples/{widgets => webenginewidgets}/browser/cookiesexceptions.ui (100%) rename examples/{widgets => webenginewidgets}/browser/data/addtab.png (100%) rename examples/{widgets => webenginewidgets}/browser/data/browser.svg (100%) rename examples/{widgets => webenginewidgets}/browser/data/closetab.png (100%) rename examples/{widgets => webenginewidgets}/browser/data/data.qrc (100%) rename examples/{widgets => webenginewidgets}/browser/data/defaultbookmarks.xbel (100%) rename examples/{widgets => webenginewidgets}/browser/data/defaulticon.png (100%) rename examples/{widgets => webenginewidgets}/browser/data/history.png (100%) rename examples/{widgets => webenginewidgets}/browser/data/loading.gif (100%) rename examples/{widgets => webenginewidgets}/browser/doc/images/browser-demo.png (100%) rename examples/{widgets => webenginewidgets}/browser/doc/src/browser.qdoc (100%) rename examples/{widgets => webenginewidgets}/browser/downloaditem.ui (100%) rename examples/{widgets => webenginewidgets}/browser/downloadmanager.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/downloadmanager.h (100%) rename examples/{widgets => webenginewidgets}/browser/downloads.ui (100%) rename examples/{widgets => webenginewidgets}/browser/edittableview.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/edittableview.h (100%) rename examples/{widgets => webenginewidgets}/browser/edittreeview.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/edittreeview.h (100%) rename examples/{widgets => webenginewidgets}/browser/history.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/history.h (100%) rename examples/{widgets => webenginewidgets}/browser/history.ui (100%) rename examples/{widgets => webenginewidgets}/browser/htmls/htmls.qrc (100%) rename examples/{widgets => webenginewidgets}/browser/htmls/notfound.html (100%) rename examples/{widgets => webenginewidgets}/browser/main.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/modelmenu.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/modelmenu.h (100%) rename examples/{widgets => webenginewidgets}/browser/networkaccessmanager.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/networkaccessmanager.h (100%) rename examples/{widgets => webenginewidgets}/browser/passworddialog.ui (100%) rename examples/{widgets => webenginewidgets}/browser/proxy.ui (100%) rename examples/{widgets => webenginewidgets}/browser/searchlineedit.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/searchlineedit.h (100%) rename examples/{widgets => webenginewidgets}/browser/settings.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/settings.h (100%) rename examples/{widgets => webenginewidgets}/browser/settings.ui (100%) rename examples/{widgets => webenginewidgets}/browser/squeezelabel.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/squeezelabel.h (100%) rename examples/{widgets => webenginewidgets}/browser/tabwidget.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/tabwidget.h (100%) rename examples/{widgets => webenginewidgets}/browser/toolbarsearch.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/toolbarsearch.h (100%) rename examples/{widgets => webenginewidgets}/browser/urllineedit.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/urllineedit.h (100%) rename examples/{widgets => webenginewidgets}/browser/webview.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/webview.h (100%) rename examples/{widgets => webenginewidgets}/browser/xbel.cpp (100%) rename examples/{widgets => webenginewidgets}/browser/xbel.h (100%) rename examples/{widgets => webenginewidgets}/fancybrowser/doc/images/fancybrowser-example.png (100%) rename examples/{widgets => webenginewidgets}/fancybrowser/doc/src/fancybrowser.qdoc (100%) rename examples/{widgets => webenginewidgets}/fancybrowser/fancybrowser.pro (73%) rename examples/{widgets => webenginewidgets}/fancybrowser/jquery.min.js (100%) rename examples/{widgets => webenginewidgets}/fancybrowser/jquery.qrc (100%) rename examples/{widgets => webenginewidgets}/fancybrowser/main.cpp (100%) rename examples/{widgets => webenginewidgets}/fancybrowser/mainwindow.cpp (100%) rename examples/{widgets => webenginewidgets}/fancybrowser/mainwindow.h (100%) 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 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 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 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 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 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 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 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 -- GitLab