From e0ab5c5e37651b7c38b6dbd371aeed01d32e70a8 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 16 Jul 2019 10:58:49 +0200 Subject: Doc: Update screenshots Change-Id: I31313d1d941a0fe37bd515b5e52b5a471e6167e5 Reviewed-by: Friedemann Kleint Reviewed-by: Jarek Kobus --- .../assistant/doc/images/assistant-assistant.png | Bin 85657 -> 47313 bytes .../assistant/doc/images/assistant-bookmarks.png | Bin 30047 -> 6083 bytes .../assistant/doc/images/assistant-dockwidgets.png | Bin 177943 -> 42222 bytes .../assistant/doc/images/assistant-index.png | Bin 39902 -> 4038 bytes .../images/assistant-preferences-documentation.png | Bin 22238 -> 9533 bytes .../doc/images/assistant-preferences-filters.png | Bin 27758 -> 10729 bytes .../doc/images/assistant-preferences-fonts.png | Bin 21100 -> 5394 bytes .../doc/images/assistant-preferences-options.png | Bin 36334 -> 5730 bytes 8 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/assistant/assistant/doc/images/assistant-assistant.png b/src/assistant/assistant/doc/images/assistant-assistant.png index d76ec0420..368b5c932 100644 Binary files a/src/assistant/assistant/doc/images/assistant-assistant.png and b/src/assistant/assistant/doc/images/assistant-assistant.png differ diff --git a/src/assistant/assistant/doc/images/assistant-bookmarks.png b/src/assistant/assistant/doc/images/assistant-bookmarks.png index 810d23960..9acdb8300 100644 Binary files a/src/assistant/assistant/doc/images/assistant-bookmarks.png and b/src/assistant/assistant/doc/images/assistant-bookmarks.png differ diff --git a/src/assistant/assistant/doc/images/assistant-dockwidgets.png b/src/assistant/assistant/doc/images/assistant-dockwidgets.png index 7a9c386a6..c657426e9 100644 Binary files a/src/assistant/assistant/doc/images/assistant-dockwidgets.png and b/src/assistant/assistant/doc/images/assistant-dockwidgets.png differ diff --git a/src/assistant/assistant/doc/images/assistant-index.png b/src/assistant/assistant/doc/images/assistant-index.png index 548c349e5..685396c97 100644 Binary files a/src/assistant/assistant/doc/images/assistant-index.png and b/src/assistant/assistant/doc/images/assistant-index.png differ diff --git a/src/assistant/assistant/doc/images/assistant-preferences-documentation.png b/src/assistant/assistant/doc/images/assistant-preferences-documentation.png index e640176ac..92e8e0568 100644 Binary files a/src/assistant/assistant/doc/images/assistant-preferences-documentation.png and b/src/assistant/assistant/doc/images/assistant-preferences-documentation.png differ diff --git a/src/assistant/assistant/doc/images/assistant-preferences-filters.png b/src/assistant/assistant/doc/images/assistant-preferences-filters.png index 3af283085..cdeda5c3d 100644 Binary files a/src/assistant/assistant/doc/images/assistant-preferences-filters.png and b/src/assistant/assistant/doc/images/assistant-preferences-filters.png differ diff --git a/src/assistant/assistant/doc/images/assistant-preferences-fonts.png b/src/assistant/assistant/doc/images/assistant-preferences-fonts.png index 4d9375917..a3879ec89 100644 Binary files a/src/assistant/assistant/doc/images/assistant-preferences-fonts.png and b/src/assistant/assistant/doc/images/assistant-preferences-fonts.png differ diff --git a/src/assistant/assistant/doc/images/assistant-preferences-options.png b/src/assistant/assistant/doc/images/assistant-preferences-options.png index 3a9efad6a..38233b7cf 100644 Binary files a/src/assistant/assistant/doc/images/assistant-preferences-options.png and b/src/assistant/assistant/doc/images/assistant-preferences-options.png differ -- cgit v1.2.3 From a8aa08498a7a16b40a4559034abb47e37d719ba4 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Mon, 15 Jul 2019 16:38:26 +0200 Subject: Doc: Update info on full-text search Update screenshot. Fixes: QTBUG-65064 Change-Id: Ic8d1201e0f2947419836d633bc53997d009d646e Reviewed-by: Friedemann Kleint Reviewed-by: Jarek Kobus --- .../assistant/doc/images/assistant-search.png | Bin 76139 -> 11710 bytes .../assistant/doc/src/assistant-quick-guide.qdoc | 21 ++++++--------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/assistant/assistant/doc/images/assistant-search.png b/src/assistant/assistant/doc/images/assistant-search.png index 3ab3caf9d..847af8ba2 100644 Binary files a/src/assistant/assistant/doc/images/assistant-search.png and b/src/assistant/assistant/doc/images/assistant-search.png differ diff --git a/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc b/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc index 28590fa25..411bf19e1 100644 --- a/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc +++ b/src/assistant/assistant/doc/src/assistant-quick-guide.qdoc @@ -169,8 +169,12 @@ \QA provides a powerful full text search engine. You can search for certain words or text in the \gui Search window. Enter the text you want to look for and press \key{Enter} or click \gui{Search}. The search is not case sensitive. - For example, \b Foo, \b fOo and \b FOO are all treated as the same. The - following are examples of common search patterns: + For example, \b Foo, \b fOo and \b FOO are all treated as the same. + + You can create complex queries using the + \l{https://sqlite.org/fts5.html#full_text_query_syntax}{FTS query syntax}. + + The following are examples of common search patterns: \list \li \c deep -- lists all the documents that contain the word \b deep @@ -182,19 +186,6 @@ \b {deep copy} \endlist - Use the \gui{Advanced search} for more flexibility. - You can specify some words so that hits containing these are excluded from the - result, or you can search for an exact phrase. Searching for similar words will - give results like these: - - \list - \li \c{QStin} -- lists all the documents with titles that are similar, such as \c{QString} - \li \c{QSting} -- lists all the documents with titles that are similar, such as \c{QString} - \li \c{QStrin} -- lists all the documents with titles that are similar, such as \c{QString} - \endlist - - Options can be combined to improve the search results. - The list of documents found is ordered according to the number of occurrences of the search text which they contain, with those containing the highest number of occurrences appearing first. Simply click any -- cgit v1.2.3 From 1112714856b3d12c3478e6a516b83dc91d402bd2 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 2 Sep 2019 11:23:10 +0200 Subject: Qt Designer/QDesignerWidgetBoxInterface: Re-add typedef Bring back the typedef removed in f562ee4402c957d66f4a5ae5b39cd2679d0c4b24 to prevent SIC in Qt 5. Change-Id: I08117d524bf1da2af9992bfd3ad5a8d28623e85c Reviewed-by: Jarek Kobus --- src/designer/src/lib/sdk/abstractwidgetbox.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h index 7d7600e5b..06de2016c 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.h +++ b/src/designer/src/lib/sdk/abstractwidgetbox.h @@ -71,6 +71,10 @@ public: QSharedDataPointer m_data; }; +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + using WidgetList = QList; +#endif + class Category { public: enum Type { Default, Scratchpad }; -- cgit v1.2.3 From f51776c427b268caf348efa524264c5e25e31a18 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 4 Sep 2019 14:11:01 +0200 Subject: Improve QDoc's generatedOutput autotest Streamline the process of adding new tests/files, by adding a helper function to both run QDoc and compare the generated output with expected data. Add a way to pass extra command line parameters to QDoc. Change-Id: I04870c18ae3d31ae07115d3d8f5d3c77d090418a Reviewed-by: Paul Wicking --- .../qdoc/generatedoutput/tst_generatedoutput.cpp | 106 ++++++++++----------- 1 file changed, 50 insertions(+), 56 deletions(-) diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index ab7c91040..01134517a 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -44,8 +44,11 @@ private: QScopedPointer m_outputDir; QString m_qdoc; - bool runQDocProcess(const QStringList &arguments); - void compareLineByLine(QString &expectedFilename, QString &actualFilename); + void runQDocProcess(const QStringList &arguments); + void compareLineByLine(const QStringList &expectedFiles); + void testAndCompare(const char *input, + const char *outNames, + const char *extraParams = nullptr); }; void tst_generatedOutput::initTestCase() @@ -66,7 +69,7 @@ void tst_generatedOutput::init() } } -bool tst_generatedOutput::runQDocProcess(const QStringList &arguments) +void tst_generatedOutput::runQDocProcess(const QStringList &arguments) { QProcess qdocProcess; qdocProcess.setProgram(m_qdoc); @@ -75,7 +78,7 @@ bool tst_generatedOutput::runQDocProcess(const QStringList &arguments) qdocProcess.waitForFinished(); if (qdocProcess.exitCode() == 0) - return true; + return; QString output = qdocProcess.readAllStandardOutput(); QString errors = qdocProcess.readAllStandardError(); @@ -85,70 +88,61 @@ bool tst_generatedOutput::runQDocProcess(const QStringList &arguments) qInfo() << "Received output:\n" << output; if (errors.size() > 0) qInfo() << "Received errors:\n" << errors; - return false; + + QFAIL("Running QDoc failed. See output above."); } -void tst_generatedOutput::compareLineByLine(QString &expected, QString &actual) +void tst_generatedOutput::compareLineByLine(const QStringList &expectedFiles) { - QFile expectedFile(expected); - if (!expectedFile.open(QIODevice::ReadOnly)) - QFAIL("Cannot open expected data file!"); - QTextStream expectedIn(&expectedFile); - - QFile actualFile(actual); - if (!actualFile.open(QIODevice::ReadOnly)) - QFAIL("Cannot open actual data file!"); - QTextStream actualIn(&actualFile); - - int lineNumber = 0; - while (!expectedIn.atEnd() && !actualIn.atEnd()) { - lineNumber++; - QString prefix = QString::number(lineNumber) + QLatin1String(": "); - QString expectedLine = prefix + expectedIn.readLine(); - QString actualLine = prefix + actualIn.readLine(); - QCOMPARE(actualLine, expectedLine); + for (const auto &file : expectedFiles) { + QString expected(QFINDTESTDATA("/expected_output/" + file)); + QString actual(m_outputDir->path() + "/" + file); + + QFile expectedFile(expected); + if (!expectedFile.open(QIODevice::ReadOnly)) + QFAIL("Cannot open expected data file!"); + QTextStream expectedIn(&expectedFile); + + QFile actualFile(actual); + if (!actualFile.open(QIODevice::ReadOnly)) + QFAIL("Cannot open actual data file!"); + QTextStream actualIn(&actualFile); + + int lineNumber = 0; + while (!expectedIn.atEnd() && !actualIn.atEnd()) { + lineNumber++; + QString prefix = QString::number(lineNumber) + QLatin1String(": "); + QString expectedLine = prefix + expectedIn.readLine(); + QString actualLine = prefix + actualIn.readLine(); + QCOMPARE(actualLine, expectedLine); + } } } -void tst_generatedOutput::htmlFromQDocFile() +void tst_generatedOutput::testAndCompare(const char *input, + const char *outNames, + const char *extraParams) { - const QStringList arguments = { - "--outputdir", - m_outputDir->path(), - QFINDTESTDATA("test.qdocconf") - }; - - if (!runQDocProcess(arguments)) - QFAIL("Running QDoc failed. See output above."); - - QString expectedFile = QFINDTESTDATA("/expected_output/qdoctests-qdocfileoutput.html"); - QString actualFile = m_outputDir->path() + QLatin1String("/qdoctests-qdocfileoutput.html"); + QStringList args{ "-outputdir", m_outputDir->path(), QFINDTESTDATA(input) }; + if (extraParams) + args << QString(QLatin1String(extraParams)).split(QChar(' ')); + runQDocProcess(args); + if (QTest::currentTestFailed()) + return; + compareLineByLine(QString(QLatin1String(outNames)).split(QChar(' '))); +} - compareLineByLine(expectedFile, actualFile); +void tst_generatedOutput::htmlFromQDocFile() +{ + testAndCompare("test.qdocconf", + "qdoctests-qdocfileoutput.html"); } void tst_generatedOutput::htmlFromQml() { - const QStringList arguments = { - "--outputdir", - m_outputDir->path(), - QFINDTESTDATA("testqml.qdocconf") - }; - - if (!runQDocProcess(arguments)) - QFAIL("Running QDoc failed. See output above."); - - const QStringList files{ - "test-componentset-example.html", - "uicomponents-qmlmodule.html"}; - - for (const auto &file : files) { - QString expectedPath = "/expected_output/" + file; - QString expectedFile(QFINDTESTDATA(expectedPath)); - QString actualFile(m_outputDir->path() + "/" + file); - - compareLineByLine(expectedFile, actualFile); - } + testAndCompare("testqml.qdocconf", + "test-componentset-example.html " + "uicomponents-qmlmodule.html"); } QTEST_APPLESS_MAIN(tst_generatedOutput) -- cgit v1.2.3 From 2174b1a34a0754376b77528161bf2328855cb0e7 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 4 Sep 2019 14:14:01 +0200 Subject: Add an initial test case for C++ documentation generated by QDoc This will be expanded later on. The minimal C++ project tests QDoc's HTML output for a module page, namespace and class reference, and some class members. Change-Id: Ifabc394116b675152d3ac95dc96a46e6e9c768ec Reviewed-by: Paul Wicking --- tests/auto/qdoc/generatedoutput/TestCPP | 1 + .../expected_output/testcpp-module.html | 42 +++++++++++++ .../expected_output/testqdoc-test-members.html | 19 ++++++ .../expected_output/testqdoc-test.html | 54 ++++++++++++++++ .../generatedoutput/expected_output/testqdoc.html | 61 ++++++++++++++++++ tests/auto/qdoc/generatedoutput/testcpp.cpp | 73 ++++++++++++++++++++++ tests/auto/qdoc/generatedoutput/testcpp.h | 39 ++++++++++++ tests/auto/qdoc/generatedoutput/testcpp.qdocconf | 7 +++ .../qdoc/generatedoutput/tst_generatedoutput.cpp | 10 +++ 9 files changed, 306 insertions(+) create mode 100644 tests/auto/qdoc/generatedoutput/TestCPP create mode 100644 tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html create mode 100644 tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html create mode 100644 tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html create mode 100644 tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html create mode 100644 tests/auto/qdoc/generatedoutput/testcpp.cpp create mode 100644 tests/auto/qdoc/generatedoutput/testcpp.h create mode 100644 tests/auto/qdoc/generatedoutput/testcpp.qdocconf diff --git a/tests/auto/qdoc/generatedoutput/TestCPP b/tests/auto/qdoc/generatedoutput/TestCPP new file mode 100644 index 000000000..50cce69ff --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/TestCPP @@ -0,0 +1 @@ +#include "testcpp.h" diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html new file mode 100644 index 000000000..92103d867 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html @@ -0,0 +1,42 @@ + + + + + + + QDoc Test C++ Classes | TestCPP + + +
+
+

Contents

+ +
+
+

QDoc Test C++ Classes

+ + +

A test module page. More...

+ + +

Namespaces

+
+ +

TestQDoc

A namespace

+ +

Classes

+
+ +

TestQDoc::Test

A class in a namespace

+ + +
+

Detailed Description

+
+ + + diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html new file mode 100644 index 000000000..caa002a7d --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html @@ -0,0 +1,19 @@ + + + + + + + List of All Members for Test | TestCPP + + +
  • Test
    • +
    +

    List of All Members for Test

    +

    This is the complete list of members for TestQDoc::Test, including inherited members.

    + + + diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html new file mode 100644 index 000000000..f0ef69491 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html @@ -0,0 +1,54 @@ + + + + + + + Test Class | TestCPP + + +
  • Test
    • +
    +
    +

    Contents

    + +
    +
    +

    Test Class

    +(TestQDoc::Test)
     + +

    A class in a namespace. More...

    + +
    +
    Header: #include <Test> +
    + +

    Public Functions

    +
    + + +
    void inlineFunction()
    int someFunction(int v)
    + + +
    +

    Detailed Description

    +
    + +
    +

    Member Function Documentation

    + +

    void Test::inlineFunction()

    +

    An inline function, documented using the \fn QDoc command.

    + + +

    int Test::someFunction(int v)

    +

    Function that takes a parameter v. Also returns the value of v.

    + +
    + + diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html new file mode 100644 index 000000000..d46a4f5c8 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html @@ -0,0 +1,61 @@ + + + + + + + TestQDoc Namespace | TestCPP + + +
    +
    +

    Contents

    + +
    +
    +

    TestQDoc Namespace

    + +

    A namespace. More...

    + +
    +
    Header: #include <TestQDoc> +
      +
    + +

    Classes

    +
    + +
    class Test
    + +

    Macros

    +
    + +
    QDOCTEST_MACRO
    + + +
    +

    Detailed Description

    + +

    Usage

    +

    This namespace is for testing QDoc output.

    +
    + +
    +

    Classes

    +

    class Test

    +

    A class in a namespace. More...

    + +
    +
    +

    Macro Documentation

    + +

    TestQDoc::QDOCTEST_MACRO

    + +
    + + diff --git a/tests/auto/qdoc/generatedoutput/testcpp.cpp b/tests/auto/qdoc/generatedoutput/testcpp.cpp new file mode 100644 index 000000000..12698c9d6 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/testcpp.cpp @@ -0,0 +1,73 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "testcpp.h" + +namespace TestQDoc { + +/*! + \module TestCPP + \title QDoc Test C++ Classes + \brief A test module page. +*/ + +/*! + \namespace TestQDoc + \inmodule TestCPP + \brief A namespace. + + \section1 Usage + This namespace is for testing QDoc output. +*/ + +/*! + \class TestQDoc::Test + \inmodule TestCPP + \brief A class in a namespace. +*/ + +/*! + \macro QDOCTEST_MACRO + \relates TestQDoc +*/ + +/*! + Function that takes a parameter \a v. + Also returns the value of \a v. +*/ +int Test::someFunction(int v) +{ + return v; +} + +/*! + \fn void TestQDoc::Test::inlineFunction() + + \brief An inline function, documented using the \CMDFN QDoc command. +*/ + +} // namespace TestQDoc diff --git a/tests/auto/qdoc/generatedoutput/testcpp.h b/tests/auto/qdoc/generatedoutput/testcpp.h new file mode 100644 index 000000000..46355711c --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/testcpp.h @@ -0,0 +1,39 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the tools applications of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#pragma once +#define QDOCTEST_MACRO test + +namespace TestQDoc { + +class Test { +public: + int someFunction(int v); + inline void inlineFunction() {}; +}; + +} // namespace TestQDoc diff --git a/tests/auto/qdoc/generatedoutput/testcpp.qdocconf b/tests/auto/qdoc/generatedoutput/testcpp.qdocconf new file mode 100644 index 000000000..70c226cf2 --- /dev/null +++ b/tests/auto/qdoc/generatedoutput/testcpp.qdocconf @@ -0,0 +1,7 @@ +project = TestCPP +includepaths += -I. + +headers = testcpp.h +sources = testcpp.cpp + +macro.CMDFN = \\\\fn diff --git a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp index 01134517a..103198d42 100644 --- a/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp +++ b/tests/auto/qdoc/generatedoutput/tst_generatedoutput.cpp @@ -38,6 +38,7 @@ private slots: void init(); void htmlFromQDocFile(); + void htmlFromCpp(); void htmlFromQml(); private: @@ -138,6 +139,15 @@ void tst_generatedOutput::htmlFromQDocFile() "qdoctests-qdocfileoutput.html"); } +void tst_generatedOutput::htmlFromCpp() +{ + testAndCompare("testcpp.qdocconf", + "testcpp-module.html " + "testqdoc-test.html " + "testqdoc-test-members.html " + "testqdoc.html"); +} + void tst_generatedOutput::htmlFromQml() { testAndCompare("testqml.qdocconf", -- cgit v1.2.3 From 112147de44d2ecd9b4cb33f6601f8aa29638ee37 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 10 Sep 2019 10:09:11 +0200 Subject: windeployqt: Warn only in case patching of Qt5Core fails After qtbase/4ac872639ed0dd3ae6627e05bdda821f7d128500, can fail for relocatable builds: Unable to patch ...\Qt5Core.dll: Could not locate pattern "qt_prfxpath=" Task-number: QTBUG-15234 Change-Id: I6df337b369d5e4c461293193bfe1c63e08b7fd35 Reviewed-by: Kai Koehne --- src/windeployqt/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp index 00fa4fbc4..a4cededce 100644 --- a/src/windeployqt/main.cpp +++ b/src/windeployqt/main.cpp @@ -1494,8 +1494,10 @@ static DeployResult deploy(const Options &options, const QString qt5CoreName = QFileInfo(libraryPath(libraryLocation, "Qt5Core", qtLibInfix, options.platform, isDebug)).fileName(); - if (!patchQtCore(targetPath + QLatin1Char('/') + qt5CoreName, errorMessage)) - return result; + if (!patchQtCore(targetPath + QLatin1Char('/') + qt5CoreName, errorMessage)) { + std::wcerr << "Warning: " << *errorMessage << '\n'; + errorMessage->clear(); + } } } // optLibraries -- cgit v1.2.3