diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-10-18 11:38:34 +0200 |
---|---|---|
committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-11-13 16:11:44 +0000 |
commit | cfe53bce924e40c944850fd0418d53c8ba760dc1 (patch) | |
tree | b8b119d19e9dd7a2802bee413ce8a74cace949c8 /examples/webenginewidgets | |
parent | 68524d22255c0e2a76b47caec3ef01f3d23d955c (diff) |
Set organizationName of all examples to QtExamples
Group directories under ~/.cache and ~/.config.
Fixes: QTBUG-71669
Change-Id: Ia55aeab8c0e38f58afcbda128f04fd3d85c3df5e
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'examples/webenginewidgets')
-rw-r--r-- | examples/webenginewidgets/contentmanipulation/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/cookiebrowser/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/html2pdf/html2pdf.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/maps/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/markdowneditor/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/minimal/doc/src/minimal.qdoc | 10 | ||||
-rw-r--r-- | examples/webenginewidgets/minimal/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/simplebrowser/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/spellchecker/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/stylesheetbrowser/main.cpp | 5 | ||||
-rw-r--r-- | examples/webenginewidgets/videoplayer/main.cpp | 1 | ||||
-rw-r--r-- | examples/webenginewidgets/webui/main.cpp | 1 |
12 files changed, 19 insertions, 6 deletions
diff --git a/examples/webenginewidgets/contentmanipulation/main.cpp b/examples/webenginewidgets/contentmanipulation/main.cpp index e816079d2..417b87184 100644 --- a/examples/webenginewidgets/contentmanipulation/main.cpp +++ b/examples/webenginewidgets/contentmanipulation/main.cpp @@ -54,6 +54,7 @@ int main(int argc, char * argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); diff --git a/examples/webenginewidgets/cookiebrowser/main.cpp b/examples/webenginewidgets/cookiebrowser/main.cpp index 0ae5433ba..2a7fe6362 100644 --- a/examples/webenginewidgets/cookiebrowser/main.cpp +++ b/examples/webenginewidgets/cookiebrowser/main.cpp @@ -54,6 +54,7 @@ int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); MainWindow window(QUrl("http://qt.io")); diff --git a/examples/webenginewidgets/html2pdf/html2pdf.cpp b/examples/webenginewidgets/html2pdf/html2pdf.cpp index 5e293261f..e9fc69534 100644 --- a/examples/webenginewidgets/html2pdf/html2pdf.cpp +++ b/examples/webenginewidgets/html2pdf/html2pdf.cpp @@ -119,6 +119,7 @@ void Html2PdfConverter::pdfPrintingFinished(const QString &filePath, bool succes int main(int argc, char *argv[]) { QApplication app(argc, argv); + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setApplicationName("html2pdf"); QCoreApplication::setApplicationVersion(QT_VERSION_STR); diff --git a/examples/webenginewidgets/maps/main.cpp b/examples/webenginewidgets/maps/main.cpp index cad9c7ea9..cfcfa06d8 100644 --- a/examples/webenginewidgets/maps/main.cpp +++ b/examples/webenginewidgets/maps/main.cpp @@ -53,6 +53,7 @@ int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); diff --git a/examples/webenginewidgets/markdowneditor/main.cpp b/examples/webenginewidgets/markdowneditor/main.cpp index de2dee605..b7a7905be 100644 --- a/examples/webenginewidgets/markdowneditor/main.cpp +++ b/examples/webenginewidgets/markdowneditor/main.cpp @@ -56,6 +56,7 @@ int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication a(argc, argv); diff --git a/examples/webenginewidgets/minimal/doc/src/minimal.qdoc b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc index 05ec9ee79..477ff521b 100644 --- a/examples/webenginewidgets/minimal/doc/src/minimal.qdoc +++ b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc @@ -42,8 +42,14 @@ \section1 The Code - In the \c main function we first set the Qt::AA_EnableHighDpiScaling. - This lets the web view automatically scale on high-dpi displays. + In the \c main function we first set the + \l{QCoreApplication::organizationName} property. This affects the locations + where Qt WebEngine stores persistent and cached data (see also + \l{QWebEngineProfile::cachePath} and + \l{QWebEngineProfile::persistentStoragePath}). + + We also set the Qt::AA_EnableHighDpiScaling attribute. This lets the web + view automatically scale on high-dpi displays. Next, we instantiate a QApplication and a QWebEngineView. The URL to load is taken from the command-line in \c commandLineUrlArgument and diff --git a/examples/webenginewidgets/minimal/main.cpp b/examples/webenginewidgets/minimal/main.cpp index f58e4d54a..b31382ad5 100644 --- a/examples/webenginewidgets/minimal/main.cpp +++ b/examples/webenginewidgets/minimal/main.cpp @@ -63,6 +63,7 @@ QUrl commandLineUrlArgument() int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); diff --git a/examples/webenginewidgets/simplebrowser/main.cpp b/examples/webenginewidgets/simplebrowser/main.cpp index 96b1eab97..0e8f86c8f 100644 --- a/examples/webenginewidgets/simplebrowser/main.cpp +++ b/examples/webenginewidgets/simplebrowser/main.cpp @@ -66,6 +66,7 @@ QUrl commandLineUrlArgument() int main(int argc, char **argv) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); diff --git a/examples/webenginewidgets/spellchecker/main.cpp b/examples/webenginewidgets/spellchecker/main.cpp index 90602f859..c2951fe00 100644 --- a/examples/webenginewidgets/spellchecker/main.cpp +++ b/examples/webenginewidgets/spellchecker/main.cpp @@ -53,6 +53,7 @@ int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QApplication app(argc, argv); WebView view; diff --git a/examples/webenginewidgets/stylesheetbrowser/main.cpp b/examples/webenginewidgets/stylesheetbrowser/main.cpp index 54fce0ce3..833ea6bb0 100644 --- a/examples/webenginewidgets/stylesheetbrowser/main.cpp +++ b/examples/webenginewidgets/stylesheetbrowser/main.cpp @@ -55,12 +55,9 @@ int main(int argc, char *argv[]) { - QCoreApplication::setOrganizationName("The Qt Company"); - QCoreApplication::setOrganizationDomain("www.qt.io"); - QCoreApplication::setApplicationName("StyleSheet Browser"); - qRegisterMetaTypeStreamOperators<StyleSheet>("StyleSheet"); + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication a(argc, argv); MainWindow w(QUrl("http://qt.io")); diff --git a/examples/webenginewidgets/videoplayer/main.cpp b/examples/webenginewidgets/videoplayer/main.cpp index cad9c7ea9..cfcfa06d8 100644 --- a/examples/webenginewidgets/videoplayer/main.cpp +++ b/examples/webenginewidgets/videoplayer/main.cpp @@ -53,6 +53,7 @@ int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); diff --git a/examples/webenginewidgets/webui/main.cpp b/examples/webenginewidgets/webui/main.cpp index 3e9f61fe4..0f6a3e87e 100644 --- a/examples/webenginewidgets/webui/main.cpp +++ b/examples/webenginewidgets/webui/main.cpp @@ -57,6 +57,7 @@ int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); WebUiHandler::registerUrlScheme(); |