Use setTabStopWidth when building with older Qt, fixes discussion #277

and the build failure mentioned in #276
eteran · Jan 15, 2021 · 46d05bc · 46d05bc
1 parent 4ae6a40
commit 46d05bc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/DialogMacros.cpp b/src/DialogMacros.cpp
@@ -27,7 +27,11 @@ DialogMacros::DialogMacros(QWidget *parent, Qt::WindowFlags f)
 	connectSlots();
 
 	const int tabStop = Preferences::GetPrefTabDist(PLAIN_LANGUAGE_MODE);  // 4 characters
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 	ui.editMacro->setTabStopDistance(tabStop * Font::characterWidth(ui.editMacro->fontMetrics(), QLatin1Char(' ')));
+#else
+	ui.editMacro->setTabStopWidth(tabStop * Font::characterWidth(ui.editMacro->fontMetrics(), QLatin1Char(' ')));
+#endif
 
 
 	CommonDialog::setButtonIcons(&ui);

diff --git a/src/DialogSmartIndent.cpp b/src/DialogSmartIndent.cpp
@@ -30,6 +30,16 @@ DialogSmartIndent::DialogSmartIndent(DocumentWidget *document, QWidget *parent,
 	connectSlots();
 
 	const int tabStop = Preferences::GetPrefTabDist(PLAIN_LANGUAGE_MODE);  // 4 characters
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
+	ui.editInit->setTabStopDistance(tabStop * Font::characterWidth(ui.editInit->fontMetrics(), QLatin1Char(' ')));
+	ui.editNewline->setTabStopDistance(tabStop * Font::characterWidth(ui.editNewline->fontMetrics(), QLatin1Char(' ')));
+	ui.editModMacro->setTabStopDistance(tabStop * Font::characterWidth(ui.editModMacro->fontMetrics(), QLatin1Char(' ')));
+#else
+	ui.editInit->setTabStopWidth(tabStop * Font::characterWidth(ui.editInit->fontMetrics(), QLatin1Char(' ')));
+	ui.editNewline->setTabStopWidth(tabStop * Font::characterWidth(ui.editNewline->fontMetrics(), QLatin1Char(' ')));
+	ui.editModMacro->setTabStopWidth(tabStop * Font::characterWidth(ui.editModMacro->fontMetrics(), QLatin1Char(' ')));
+#endif
+
 	ui.editInit->setTabStopDistance(tabStop * Font::characterWidth(ui.editInit->fontMetrics(), QLatin1Char(' ')));
 	ui.editNewline->setTabStopDistance(tabStop * Font::characterWidth(ui.editNewline->fontMetrics(), QLatin1Char(' ')));
 	ui.editModMacro->setTabStopDistance(tabStop * Font::characterWidth(ui.editModMacro->fontMetrics(), QLatin1Char(' ')));

diff --git a/src/DialogSmartIndentCommon.cpp b/src/DialogSmartIndentCommon.cpp
@@ -22,7 +22,12 @@ DialogSmartIndentCommon::DialogSmartIndentCommon(QWidget *parent, Qt::WindowFlag
 	connectSlots();
 
 	const int tabStop = Preferences::GetPrefTabDist(PLAIN_LANGUAGE_MODE);  // 4 characters
+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 	ui.editCode->setTabStopDistance(tabStop * Font::characterWidth(ui.editCode->fontMetrics(), QLatin1Char(' ')));
+#else
+	ui.editCode->setTabStopWidth(tabStop * Font::characterWidth(ui.editCode->fontMetrics(), QLatin1Char(' ')));
+#endif
+
 
 	ui.editCode->setPlainText(SmartIndent::CommonMacros);
 }