From cfe53bce924e40c944850fd0418d53c8ba760dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Thu, 18 Oct 2018 11:38:34 +0200 Subject: Set organizationName of all examples to QtExamples Group directories under ~/.cache and ~/.config. Fixes: QTBUG-71669 Change-Id: Ia55aeab8c0e38f58afcbda128f04fd3d85c3df5e Reviewed-by: Michal Klocek --- examples/webengine/customdialogs/main.cpp | 1 + examples/webengine/minimal/doc/src/minimal.qdoc | 12 +++++++++--- examples/webengine/minimal/main.cpp | 1 + examples/webengine/quicknanobrowser/main.cpp | 1 + examples/webengine/recipebrowser/main.cpp | 1 + examples/webenginewidgets/contentmanipulation/main.cpp | 1 + examples/webenginewidgets/cookiebrowser/main.cpp | 1 + examples/webenginewidgets/html2pdf/html2pdf.cpp | 1 + examples/webenginewidgets/maps/main.cpp | 1 + examples/webenginewidgets/markdowneditor/main.cpp | 1 + examples/webenginewidgets/minimal/doc/src/minimal.qdoc | 10 ++++++++-- examples/webenginewidgets/minimal/main.cpp | 1 + examples/webenginewidgets/simplebrowser/main.cpp | 1 + examples/webenginewidgets/spellchecker/main.cpp | 1 + examples/webenginewidgets/stylesheetbrowser/main.cpp | 5 +---- examples/webenginewidgets/videoplayer/main.cpp | 1 + examples/webenginewidgets/webui/main.cpp | 1 + 17 files changed, 32 insertions(+), 9 deletions(-) (limited to 'examples') diff --git a/examples/webengine/customdialogs/main.cpp b/examples/webengine/customdialogs/main.cpp index dea664c59..35f39211d 100644 --- a/examples/webengine/customdialogs/main.cpp +++ b/examples/webengine/customdialogs/main.cpp @@ -65,6 +65,7 @@ typedef QGuiApplication Application; int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); Application app(argc, argv); QtWebEngine::initialize(); diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc index e021a81d1..8d12afc7c 100644 --- a/examples/webengine/minimal/doc/src/minimal.qdoc +++ b/examples/webengine/minimal/doc/src/minimal.qdoc @@ -50,9 +50,15 @@ \skipto #include \printto main - In the \c main function we first set the Qt::AA_EnableHighDpiScaling - attribute. This lets the web view automatically scale on high-dpi displays. - Then we instantiate a QGuiApplication object. + 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{WebEngineProfile::cachePath} and + \l{WebEngineProfile::persistentStoragePath}). + + We also set the Qt::AA_EnableHighDpiScaling attribute. This lets the web + view automatically scale on high-dpi displays. Then we instantiate a + QGuiApplication object. Next, we call \l{QtWebEngine::initialize}, which makes sure that OpenGL contexts can be shared between the main process and the dedicated renderer diff --git a/examples/webengine/minimal/main.cpp b/examples/webengine/minimal/main.cpp index 21a15d19c..9db6ea6aa 100644 --- a/examples/webengine/minimal/main.cpp +++ b/examples/webengine/minimal/main.cpp @@ -54,6 +54,7 @@ int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); diff --git a/examples/webengine/quicknanobrowser/main.cpp b/examples/webengine/quicknanobrowser/main.cpp index 63725d3e2..18ba7b3e2 100644 --- a/examples/webengine/quicknanobrowser/main.cpp +++ b/examples/webengine/quicknanobrowser/main.cpp @@ -78,6 +78,7 @@ static QUrl startupUrl() int main(int argc, char **argv) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); Application app(argc, argv); diff --git a/examples/webengine/recipebrowser/main.cpp b/examples/webengine/recipebrowser/main.cpp index 284f75a72..6e6d69804 100644 --- a/examples/webengine/recipebrowser/main.cpp +++ b/examples/webengine/recipebrowser/main.cpp @@ -56,6 +56,7 @@ int main(int argc, char *argv[]) { + QCoreApplication::setOrganizationName("QtExamples"); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QGuiApplication app(argc, argv); QtWebEngine::initialize(); 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"); + 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(); -- cgit v1.2.3