diff options
Diffstat (limited to 'libre/qtcreator/libre.patch')
| -rw-r--r-- | libre/qtcreator/libre.patch | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/libre/qtcreator/libre.patch b/libre/qtcreator/libre.patch index ef434c9d9..01ea21ae1 100644 --- a/libre/qtcreator/libre.patch +++ b/libre/qtcreator/libre.patch @@ -40,7 +40,7 @@ diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/tran index 07f8e0ba8..f05abba0f 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts -@@ -8875,14 +8875,6 @@ do projektu "%2".</translation> +@@ -8946,14 +8946,6 @@ do projektu "%2".</translation> <translation>Klasy służące do wyświetlania zawartości plików SVG</translation> </message> <message> @@ -59,7 +59,7 @@ diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/tran index 7ada6cbbc..ba74b030b 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts -@@ -34077,14 +34077,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf +@@ -35630,14 +35630,6 @@ For more details, see /etc/sysctl.d/10-ptrace.conf <translation>Классы для отображения содержимого файлов SVG</translation> </message> <message> @@ -74,25 +74,25 @@ index 7ada6cbbc..ba74b030b 100644 <source>Classes for displaying and editing Web content</source> <translation>Классы для отображения и правки вэб-страниц</translation> </message> -diff --git a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml +diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml index 23fad843d..4864a9c8d 100644 ---- a/share/qtcreator/welcomescreen/qtcreator_tutorials.xml -+++ b/share/qtcreator/welcomescreen/qtcreator_tutorials.xml +--- a/src/plugins/qtsupport/qtcreator_tutorials.xml ++++ b/src/plugins/qtsupport/qtcreator_tutorials.xml @@ -105,14 +105,6 @@ - <description><![CDATA[Comparison of Qt Widgets and Qt Quick Controls.]]></description> - <tags>qt quick,widgets</tags> + <description><![CDATA[Using Qt with macOS native windows.]]></description> + <tags>macos</tags> </tutorial> -- <tutorial imageUrl="images/icons/worldsummit15.png" difficulty="" projectPath="" name="Qt's Web Offering - An Overview" isVideo="true" videoUrl="https://www.youtube.com/watch?v=XW-oTBCj1JQ" videoLength="23:32"> +- <tutorial imageUrl=":qtsupport/images/icons/worldsummit15.png" difficulty="" projectPath="" name="Qt's Web Offering - An Overview" isVideo="true" videoUrl="https://www.youtube.com/watch?v=XW-oTBCj1JQ" videoLength="23:32"> - <description><![CDATA[Overview of the Qt modules that provide functions for embedding web content into applications.]]></description> - <tags>qt webengine</tags> - </tutorial> -- <tutorial imageUrl="images/icons/worldsummit15.png" difficulty="" projectPath="" name="Qt WebEngine – Taming the Beast" isVideo="true" videoUrl="https://www.youtube.com/watch?v=3CTFxhBc_1I" videoLength="58:23"> +- <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="New Possibilities with Qt WebEngine" isVideo="true" videoUrl="https://youtu.be/E7CIIHT_jCk" videoLength="22:29"> - <description><![CDATA[Using the Qt WebEngine module.]]></description> - <tags>qt webengine</tags> - </tutorial> - <tutorial imageUrl="images/icons/worldsummit15.png" difficulty="" projectPath="" name="Building Desktop and Embedded UIs with Qt 3D" isVideo="true" videoUrl="https://www.youtube.com/watch?v=QCdti6xmug0" videoLength="47:40"> - <description><![CDATA[Adding 3D content to Qt applications.]]></description> - <tags>qt,qt creator,3d</tags> + <tutorial imageUrl=":qtsupport/images/icons/worldsummit16.png" difficulty="" projectPath="" name="Developing for Multiple Screen Resolutions and Platforms" isVideo="true" videoUrl="https://youtu.be/qclquZ99ZVQ" videoLength="27:44"> + <description><![CDATA[Best practices for an efficient app lifecycle.]]></description> + <tags>qt,qt quick,screen resolution</tags> diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro index ffe71b6f1..a8d0bd72f 100644 --- a/src/plugins/help/help.pro @@ -125,7 +125,7 @@ index 115bdfbca..8bde52c9f 100644 #include <bookmarkmanager.h> #include <contentwindow.h> -@@ -376,9 +373,6 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom) +@@ -369,9 +366,6 @@ HelpViewer *HelpPlugin::createHelpViewer(qreal zoom) typedef std::function<HelpViewer *()> ViewerFactory; typedef QPair<QByteArray, ViewerFactory> ViewerFactoryItem; // id -> factory QVector<ViewerFactoryItem> factories; @@ -154,23 +154,11 @@ index a10899a2a..9ce2b463d 100644 {"webkit", QLatin1String("QtWebKit"), QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"), -diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp -index df9a8110a..e2d2eaa37 100644 ---- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp -+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp -@@ -792,7 +792,6 @@ static bool isBlacklistImport(const ImportKey &importKey) - || importKey.libraryQualifiedPath() == QStringLiteral("Qt.WebSockets") - || importKey.libraryQualifiedPath() == QStringLiteral("QtWebkit") - || importKey.libraryQualifiedPath() == QStringLiteral("QtLocation") -- || importKey.libraryQualifiedPath() == QStringLiteral("QtWebEngine") - || importKey.libraryQualifiedPath() == QStringLiteral("QtWebChannel") - || importKey.libraryQualifiedPath() == QStringLiteral("QtWinExtras") - || importKey.libraryQualifiedPath() == QStringLiteral("QtPurchasing") diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index db4c4e1cd..6703f190c 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py -@@ -673,9 +673,6 @@ def getHelpViewer(): +@@ -688,9 +688,6 @@ def getHelpViewer(): except: pass try: @@ -185,7 +173,7 @@ index 7f046e76a..90412afa6 100755 --- a/tests/system/suite_HELP/tst_HELP04/test.py +++ b/tests/system/suite_HELP/tst_HELP04/test.py @@ -32,22 +32,6 @@ urlDictionary = { "deployment":"qthelp://com.trolltech.qt.481/qdoc/gettingstarte - "build":"qthelp://com.trolltech.qt.481/qdoc/sql-driver.html" } + "build":"qthelp://com.trolltech.qt.487/qdoc/sql-driver.html" } -def __getSelectedText__(): @@ -223,7 +211,7 @@ diff --git a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_ index d3a824e96..8a98b8b6e 100644 --- a/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv +++ b/tests/system/suite_general/tst_openqt_creator/testdata/projecttree_creator.tsv -@@ -6862,7 +6862,6 @@ +@@ -7306,7 +7306,6 @@ "searchtaskhandler.h" "4" "searchwidget.h" "4" "textbrowserhelpviewer.h" "4" @@ -231,7 +219,7 @@ index d3a824e96..8a98b8b6e 100644 "xbelsupport.h" "4" "Sources" "3" "centralwidget.cpp" "4" -@@ -6886,7 +6885,6 @@ +@@ -7328,7 +7327,6 @@ "searchtaskhandler.cpp" "4" "searchwidget.cpp" "4" "textbrowserhelpviewer.cpp" "4" |