Path: blob/master/scripts/deps/qttools-linguist-without-quick.patch
7197 views
--- a/src/linguist/CMakeLists.txt1+++ b/src/linguist/CMakeLists.txt2@@ -16,7 +16,7 @@ add_subdirectory(lupdate)3add_subdirectory(lupdate-pro)4if(QT_FEATURE_process AND QT_FEATURE_pushbutton AND QT_FEATURE_toolbutton5AND QT_FEATURE_png AND QT_FEATURE_mdiarea AND QT_FEATURE_syntaxhighlighter6- AND TARGET Qt::Widgets AND TARGET Qt::Quick)7+ AND TARGET Qt::Widgets)8add_subdirectory(linguist)9endif()1011--- a/src/linguist/linguist/CMakeLists.txt12+++ b/src/linguist/linguist/CMakeLists.txt13@@ -22,7 +22,6 @@ qt_internal_add_app(linguist14errorsview.cpp errorsview.h15finddialog.cpp finddialog.h finddialog.ui16uiformpreviewview.cpp uiformpreviewview.h17- qmlformpreviewview.h qmlformpreviewview.cpp18globals.cpp globals.h19main.cpp20mainwindow.cpp mainwindow.h mainwindow.ui21@@ -53,8 +52,6 @@ qt_internal_add_app(linguist22Qt::GuiPrivate23Qt::UiToolsPrivate24Qt::Widgets25- Qt::QuickWidgets26- Qt::QuickLayouts27)2829qt_internal_extend_target(linguist CONDITION QT_FEATURE_printsupport30@@ -66,46 +63,6 @@ qt_internal_extend_target(linguist CONDITION QT_FEATURE_printsupport3132set(available_plugins "")3334-set(plugin_targets35- Qt::qtquickcontrols2plugin36- Qt::qtquick2plugin37- Qt::qtquickdialogsplugin38- Qt::qtquickcontrols2universalstyleplugin39- Qt::qtquickcontrols2basicstyleplugin40- Qt::qtquickcontrols2fluentwinui3styleplugin41- Qt::qtquickcontrols2fusionstyleplugin42- Qt::qtquickcontrols2imaginestyleplugin43- Qt::qtquickcontrols2iosstyleplugin44- Qt::qtquickcontrols2macosstyleplugin45- Qt::qtquickcontrols2materialstyleplugin46- Qt::qtquicktemplates2plugin47- Qt::qtquickcontrols2implplugin48- Qt::qtquickdialogs2quickimplplugin49- Qt::qtquickcontrols2universalstyleimplplugin50- Qt::qtquickcontrols2basicstyleimplplugin51- Qt::qtquickcontrols2fluentwinui3styleimplplugin52- Qt::qtquickcontrols2fusionstyleimplplugin53- Qt::qtquickcontrols2imaginestyleimplplugin54- Qt::qtquickcontrols2iosstyleimplplugin55- Qt::qtquickcontrols2macosstyleimplplugin56- Qt::qtquickcontrols2materialstyleimplplugin57- Qt::quickwindow58-)59-60-foreach(plugin ${plugin_targets})61- if(TARGET ${plugin})62- list(APPEND available_plugins ${plugin})63- endif()64-endforeach()65-66-if (available_plugins)67- if(BUILD_SHARED_LIBS)68- add_dependencies(linguist ${available_plugins})69- else()70- qt_internal_extend_target(linguist LIBRARIES ${available_plugins})71- endif()72-endif()73-74qt_add_ui(linguist75SOURCES76batchtranslation.ui77--- a/src/linguist/linguist/mainwindow.cpp78+++ b/src/linguist/linguist/mainwindow.cpp79@@ -12,7 +12,6 @@80#include "errorsview.h"81#include "finddialog.h"82#include "uiformpreviewview.h"83-#include "qmlformpreviewview.h"84#include "globals.h"85#include "messageeditor.h"86#include "messagemodel.h"87@@ -79,11 +78,6 @@ static bool hasUiFormPreview(const QString &fileName)88return fileName.endsWith(".ui"_L1) || fileName.endsWith(".jui"_L1);89}9091-static bool hasQmlFormPreview(const QString &fileName, bool qmlPreviewChecked)92-{93- return fileName.endsWith(QLatin1String(".qml")) && qmlPreviewChecked;94-}95-96static QString leadingWhitespace(const QString &str)97{98int i = 0;99@@ -491,11 +485,9 @@ MainWindow::MainWindow()100m_sourceAndFormView = new QStackedWidget(this);101m_sourceAndFormDock->setWidget(m_sourceAndFormView);102m_uiFormPreviewView = new UiFormPreviewView(0, m_dataModel);103- m_qmlFormPreviewView = new QmlFormPreviewView(m_dataModel);104m_sourceCodeView = new SourceCodeView(0);105m_sourceAndFormView->addWidget(m_sourceCodeView);106m_sourceAndFormView->addWidget(m_uiFormPreviewView);107- m_sourceAndFormView->addWidget(m_qmlFormPreviewView);108109// Set up errors dock widget110m_errorsDock = new QDockWidget(this);111@@ -693,7 +685,6 @@ void MainWindow::modelCountChanged()112m_ui.actionFindPrev->setEnabled(false);113114m_uiFormPreviewView->setSourceContext(-1, 0);115- m_qmlFormPreviewView->setSourceContext(-1, 0);116}117118struct OpenedFile {119@@ -1673,9 +1664,6 @@ void MainWindow::translationChanged(const MultiDataIndex &index)120MessageItem *m = m_dataModel->messageItem(index);121if (hasUiFormPreview(m->fileName()))122m_uiFormPreviewView->setSourceContext(index.model(), m);123- else if (hasQmlFormPreview(m->fileName(), m_ui.actionQmlPreview->isChecked()))124- if (!m_qmlFormPreviewView->setSourceContext(index.model(), m))125- m_ui.actionQmlPreview->setChecked(false);126}127128// This and the following function operate directly on the messageitem,129@@ -1691,10 +1679,6 @@ void MainWindow::updateTranslation(const QStringList &translations)130m->setTranslations(translations);131if (!m->fileName().isEmpty() && hasUiFormPreview(m->fileName()))132m_uiFormPreviewView->setSourceContext(m_currentIndex.model(), m);133- else if (!m->fileName().isEmpty()134- && hasQmlFormPreview(m->fileName(), m_ui.actionQmlPreview->isChecked()))135- if (!m_qmlFormPreviewView->setSourceContext(m_currentIndex.model(), m))136- m_ui.actionQmlPreview->setChecked(false);137updateDanger(m_currentIndex, true);138139if (m->isFinished())140@@ -2099,7 +2083,6 @@ void MainWindow::setupMenuBar()141connect(m_ui.actionDisplayGuesses, &QAction::triggered,142m_phraseView, &PhraseView::toggleGuessing);143connect(m_ui.actionStatistics, &QAction::triggered, this, &MainWindow::showStatistics);144- connect(m_ui.actionQmlPreview, &QAction::triggered, this, &MainWindow::toggleQmlPreview);145connect(m_ui.actionVisualizeWhitespace, &QAction::triggered,146this, &MainWindow::toggleVisualizeWhitespace);147connect(m_ui.actionIncreaseZoom, &QAction::triggered,148@@ -2209,11 +2192,7 @@ void MainWindow::updateSourceView(int model, MessageItem *item)149if (hasUiFormPreview(item->fileName())) {150m_sourceAndFormView->setCurrentWidget(m_uiFormPreviewView);151m_uiFormPreviewView->setSourceContext(model, item);152- } else if (hasQmlFormPreview(item->fileName(), m_ui.actionQmlPreview->isChecked())153- && m_qmlFormPreviewView->setSourceContext(model, item)) {154- m_sourceAndFormView->setCurrentWidget(m_qmlFormPreviewView);155} else {156- m_ui.actionQmlPreview->setChecked(false);157m_sourceAndFormView->setCurrentWidget(m_sourceCodeView);158QDir dir = QFileInfo(m_dataModel->srcFileName(model)).dir();159QString fileName = QDir::cleanPath(dir.absoluteFilePath(item->fileName()));160@@ -2754,14 +2733,6 @@ void MainWindow::showStatistics()161updateStatistics();162}163164-void MainWindow::toggleQmlPreview()165-{166- if (m_ui.actionQmlPreview->isChecked())167- m_sourceAndFormView->setCurrentWidget(m_qmlFormPreviewView);168- else169- m_sourceAndFormView->setCurrentWidget(m_sourceCodeView);170-}171-172void MainWindow::toggleVisualizeWhitespace()173{174m_messageEditor->setVisualizeWhitespace(m_ui.actionVisualizeWhitespace->isChecked());175--- a/src/linguist/linguist/mainwindow.h176+++ b/src/linguist/linguist/mainwindow.h177@@ -37,7 +37,6 @@ class BatchTranslationDialog;178class ErrorsView;179class FocusWatcher;180class UiFormPreviewView;181-class QmlFormPreviewView;182class MessageEditor;183class PhraseView;184class SourceCodeView;185@@ -130,7 +129,6 @@ private slots:186FindDialog::FindOptions options, int statusFilter);187void revalidate();188void showStatistics();189- void toggleQmlPreview();190void toggleVisualizeWhitespace();191void onWhatsThis();192void updatePhraseDicts();193@@ -196,7 +194,6 @@ private:194QStackedWidget *m_sourceAndFormView;195SourceCodeView *m_sourceCodeView;196UiFormPreviewView *m_uiFormPreviewView;197- QmlFormPreviewView *m_qmlFormPreviewView;198ErrorsView *m_errorsView;199QLabel *m_progressLabel;200QLabel *m_modifiedLabel;201--- a/src/linguist/linguist/mainwindow.ui202+++ b/src/linguist/linguist/mainwindow.ui203@@ -97,7 +97,6 @@204</widget>205<addaction name="actionResetSorting"/>206<addaction name="actionDisplayGuesses"/>207- <addaction name="actionQmlPreview"/>208<addaction name="actionLengthVariants"/>209<addaction name="actionVisualizeWhitespace"/>210<addaction name="separator"/>211@@ -646,26 +645,6 @@212<enum>QAction::NoRole</enum>213</property>214</action>215- <action name="actionQmlPreview">216- <property name="checkable">217- <bool>true</bool>218- </property>219- <property name="checked">220- <bool>true</bool>221- </property>222- <property name="text">223- <string>&QML preview</string>224- </property>225- <property name="toolTip">226- <string>Displays a preview of QML documents.</string>227- </property>228- <property name="whatsThis">229- <string/>230- </property>231- <property name="menuRole">232- <enum>QAction::NoRole</enum>233- </property>234- </action>235<action name="actionManual">236<property name="text">237<string>&Manual</string>238239240