diff options
| author | Theo von Arx <theova@member.fsf.org> | 2020-05-01 10:29:59 +0200 |
|---|---|---|
| committer | Andreas Grapentin <andreas@grapentin.org> | 2020-05-12 23:10:34 +0200 |
| commit | 0039858669c0e8e16983c88533cba3ccff9b4306 (patch) | |
| tree | bdccd482afeaedf73c4f1801e62b5c26c587c4c5 /libre/qtcreator/libre.patch | |
| parent | 4e63418195e6edd08cbba592d77d5a931260627d (diff) | |
| download | abslibre-0039858669c0e8e16983c88533cba3ccff9b4306.tar.gz abslibre-0039858669c0e8e16983c88533cba3ccff9b4306.tar.bz2 abslibre-0039858669c0e8e16983c88533cba3ccff9b4306.zip | |
Update libre/qtcreator to 4.12.0
Signed-off-by: Andreas Grapentin <andreas@grapentin.org>
Diffstat (limited to 'libre/qtcreator/libre.patch')
| -rw-r--r-- | libre/qtcreator/libre.patch | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch index ac04ccbf1..6b6a869e8 100644 --- a/libre/qtcreator/libre.patch +++ b/libre/qtcreator/libre.patch @@ -1,8 +1,8 @@ diff --git a/src/plugins/help/CMakeLists.txt b/src/plugins/help/CMakeLists.txt -index ac70c823..f6c34f3f 100644 +index a6711862..0eeea39c 100644 --- a/src/plugins/help/CMakeLists.txt +++ b/src/plugins/help/CMakeLists.txt -@@ -37,17 +37,6 @@ extend_qtc_plugin(Help +@@ -36,17 +36,6 @@ extend_qtc_plugin(Help macwebkithelpviewer.mm ) @@ -21,12 +21,12 @@ index ac70c823..f6c34f3f 100644 add_subdirectory(qlitehtml) else() diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro -index f4786112..8d20a4bc 100644 +index 7b58578e..c1627e89 100644 --- a/src/plugins/help/help.pro +++ b/src/plugins/help/help.pro -@@ -56,13 +56,6 @@ FORMS += docsettingspage.ui \ - generalsettingspage.ui \ - remotehelpfilter.ui +@@ -53,13 +53,6 @@ FORMS += docsettingspage.ui \ + filtersettingspage.ui \ + generalsettingspage.ui -!isEmpty(QT.webenginewidgets.name) { - QT += webenginewidgets @@ -39,43 +39,42 @@ index f4786112..8d20a4bc 100644 DEFINES += QTC_MAC_NATIVE_HELPVIEWER HEADERS += macwebkithelpviewer.h diff --git a/src/plugins/help/help.qbs b/src/plugins/help/help.qbs -index d1458d84..da915e52 100644 +index e1268e72..0abaa91f 100644 --- a/src/plugins/help/help.qbs +++ b/src/plugins/help/help.qbs -@@ -5,7 +5,6 @@ QtcPlugin { +@@ -10,7 +10,6 @@ Project { - Depends { name: "Qt"; submodules: ["help", "network", "sql"]; } - Depends { name: "Qt.printsupport" } -- Depends { name: "Qt.webenginewidgets"; required: false } + Depends { name: "Qt"; submodules: ["help", "network", "sql"]; } + Depends { name: "Qt.printsupport" } +- Depends { name: "Qt.webenginewidgets"; required: false } - Depends { name: "Aggregation" } - Depends { name: "Utils" } -@@ -17,8 +16,6 @@ QtcPlugin { + Depends { name: "Aggregation" } + Depends { name: "Utils" } +@@ -24,8 +23,6 @@ Project { - cpp.defines: { - var defines = base.concat(["QT_CLUCENE_SUPPORT"]); -- if (Qt.webenginewidgets.present) -- defines.push("QTC_WEBENGINE_HELPVIEWER"); - return defines; - } + cpp.defines: { + var defines = base.concat(["QT_CLUCENE_SUPPORT"]); +- if (Qt.webenginewidgets.present) +- defines.push("QTC_WEBENGINE_HELPVIEWER"); + if (qlitehtml.present) + defines.push("QTC_LITEHTML_HELPVIEWER") + return defines; +@@ -60,13 +57,6 @@ Project { + ] + } -@@ -52,14 +49,6 @@ QtcPlugin { - ] - } +- Group { +- name: "WebEngine Sources" +- condition: Qt.webenginewidgets.present +- files: [ +- "webenginehelpviewer.cpp", "webenginehelpviewer.h" +- ] +- } -- Group { -- name: "WebEngine Sources" -- condition: Qt.webenginewidgets.present -- files: [ -- "webenginehelpviewer.cpp", "webenginehelpviewer.h" -- ] -- } -- - Group { - id: sharedSources - name: "Shared Sources" + Group { + name: "litehtml-specific sources" diff --git a/src/plugins/help/localhelpmanager.cpp b/src/plugins/help/localhelpmanager.cpp -index 8af763f4..cec1134e 100644 +index f8a02eb7..f993a192 100644 --- a/src/plugins/help/localhelpmanager.cpp +++ b/src/plugins/help/localhelpmanager.cpp @@ -31,12 +31,6 @@ @@ -99,7 +98,7 @@ index 8af763f4..cec1134e 100644 static const char kTextBrowserBackend[] = "textbrowser"; static const int kDefaultFallbackFontSize = 14; -@@ -315,29 +308,13 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend() +@@ -318,29 +311,13 @@ HelpViewerFactory LocalHelpManager::defaultViewerBackend() return *factory; } if (!backend.isEmpty()) |