According to the README, we require Qt 5.2 or higher for 2.4. There is still some code for Qt < 5.2 in the source. Particularly a self-baked "Don't ask me again" warning dialog.
OK to remove that (see patch)? -- Jürgen
diff --git a/src/frontends/qt/FancyLineEdit.cpp b/src/frontends/qt/FancyLineEdit.cpp index 570d6cce19..269a717ed4 100644 --- a/src/frontends/qt/FancyLineEdit.cpp +++ b/src/frontends/qt/FancyLineEdit.cpp @@ -15,10 +15,6 @@ #include "FancyLineEdit.h" -#if QT_VERSION < 0x050200 -#include "GuiApplication.h" -#endif - #include <QEvent> #include <QDebug> #include <QString> diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp index 165d14081d..2eba43221a 100644 --- a/src/frontends/qt/GuiApplication.cpp +++ b/src/frontends/qt/GuiApplication.cpp @@ -2954,11 +2954,7 @@ namespace { QFont const GuiApplication::typewriterSystemFont() { -#if QT_VERSION >= 0x050200 QFont font = QFontDatabase::systemFont(QFontDatabase::FixedFont); -#else - QFont font("monospace"); -#endif if (!isFixedPitch(font)) { // try to enforce a real monospaced font font.setStyleHint(QFont::Monospace); diff --git a/src/frontends/qt/GuiProgress.cpp b/src/frontends/qt/GuiProgress.cpp index a21baf338c..80ba8aecf8 100644 --- a/src/frontends/qt/GuiProgress.cpp +++ b/src/frontends/qt/GuiProgress.cpp @@ -32,22 +32,6 @@ namespace lyx { namespace frontend { -// This dialog is only a fallback for Qt < 5.2, which does not feature -// QMessageBox::setCheckBox() yet. Note that it has issues with line -// breaking and size, in particular with html. -#if QT_VERSION < 0x050200 -class GuiToggleWarningDialog : public QDialog, public Ui::ToggleWarningUi -{ -public: - GuiToggleWarningDialog(QWidget * parent) : QDialog(parent) - { - Ui::ToggleWarningUi::setupUi(this); - QDialog::setModal(true); - } -}; -#endif - - GuiProgress::GuiProgress() { connect(this, SIGNAL(processStarted(QString const &)), SLOT(doProcessStarted(QString const &))); @@ -174,21 +158,6 @@ void GuiProgress::doToggleWarning(QString const & title, QString const & msg, QS if (settings.value("hidden_warnings/" + msg, false).toBool()) return; -// Qt < 5.2 does not feature QMessageBox::setCheckBox() yet, -// so we roll our own dialog. -#if QT_VERSION < 0x050200 - GuiToggleWarningDialog * dlg = - new GuiToggleWarningDialog(qApp->focusWidget()); - - dlg->setWindowTitle(title); - dlg->messageLA->setText(formatted); - dlg->dontShowAgainCB->setChecked(false); - - if (dlg->exec() == QDialog::Accepted) - if (dlg->dontShowAgainCB->isChecked()) - settings.setValue("hidden_warnings/" - + msg, true); -#else QCheckBox * dontShowAgainCB = new QCheckBox(); dontShowAgainCB->setText(qt_("&Do not show this warning again!")); dontShowAgainCB->setToolTip(qt_("If you check this, LyX will not warn you again in the given case.")); @@ -199,7 +168,6 @@ void GuiProgress::doToggleWarning(QString const & title, QString const & msg, QS if (dontShowAgainCB->isChecked()) settings.setValue("hidden_warnings/" + msg, true); -#endif } diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp index ddf7e8df85..2d8847e8d5 100644 --- a/src/frontends/qt/GuiView.cpp +++ b/src/frontends/qt/GuiView.cpp @@ -1122,11 +1122,9 @@ void GuiView::updateLockToolbars() if (tb && tb->isMovable()) toolbarsMovable_ = true; } -#if QT_VERSION >= 0x050200 // set unified mac toolbars only when not movable as recommended: // https://doc.qt.io/qt-5/qmainwindow.html#unifiedTitleAndToolBarOnMac-prop setUnifiedTitleAndToolBarOnMac(!toolbarsMovable_); -#endif } diff --git a/src/frontends/qt/GuiWorkArea.cpp b/src/frontends/qt/GuiWorkArea.cpp index ef91e0b7fd..099b129bb7 100644 --- a/src/frontends/qt/GuiWorkArea.cpp +++ b/src/frontends/qt/GuiWorkArea.cpp @@ -1503,11 +1503,9 @@ TabWorkArea::TabWorkArea(QWidget * parent) QObject::connect(this, SIGNAL(currentChanged(int)), this, SLOT(on_currentTabChanged(int))); -#if QT_VERSION >= 0x050200 // Fix for #11835 QObject::connect(this, SIGNAL(tabBarClicked(int)), this, SLOT(on_currentTabChanged(int))); -#endif closeBufferButton = new QToolButton(this); closeBufferButton->setPalette(pal); diff --git a/src/frontends/qt/Makefile.am b/src/frontends/qt/Makefile.am index 9ca258d9d3..c038e3f882 100644 --- a/src/frontends/qt/Makefile.am +++ b/src/frontends/qt/Makefile.am @@ -351,7 +351,6 @@ UIFILES = \ TextLayoutUi.ui \ ThesaurusUi.ui \ TocUi.ui \ - ToggleWarningUi.ui \ ViewSourceUi.ui \ VSpaceUi.ui \ WorkAreaUi.ui \ diff --git a/src/frontends/qt/ui/ToggleWarningUi.ui b/src/frontends/qt/ui/ToggleWarningUi.ui deleted file mode 100644 index 1b8b746591..0000000000 --- a/src/frontends/qt/ui/ToggleWarningUi.ui +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<ui version="4.0"> - <class>ToggleWarningUi</class> - <widget class="QDialog" name="ToggleWarningUi"> - <property name="geometry"> - <rect> - <x>0</x> - <y>0</y> - <width>269</width> - <height>140</height> - </rect> - </property> - <property name="windowTitle"> - <string>Enter text</string> - </property> - <property name="sizeGripEnabled"> - <bool>true</bool> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="2"> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>247</width> - <height>16</height> - </size> - </property> - </spacer> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="messageLA"> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="2" column="0" colspan="2"> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>247</width> - <height>16</height> - </size> - </property> - </spacer> - </item> - <item row="3" column="0" colspan="2"> - <widget class="QCheckBox" name="dontShowAgainCB"> - <property name="toolTip"> - <string>If you check this, LyX will not warn you again in the given case.</string> - </property> - <property name="text"> - <string>&Do not show this warning again!</string> - </property> - </widget> - </item> - <item row="4" column="0" colspan="2"> - <widget class="QDialogButtonBox" name="buttonBox"> - <property name="standardButtons"> - <set>QDialogButtonBox::Ok</set> - </property> - <property name="centerButtons"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - <includes> - <include location="local">qt_i18n.h</include> - </includes> - <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>accepted()</signal> - <receiver>ToggleWarningUi</receiver> - <slot>accept()</slot> - <hints> - <hint type="sourcelabel"> - <x>98</x> - <y>114</y> - </hint> - <hint type="destinationlabel"> - <x>80</x> - <y>805</y> - </hint> - </hints> - </connection> - </connections> -</ui>
-- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel