From 61005608ca1fb2fcd04b9f7eb28b94b36da67e19 Mon Sep 17 00:00:00 2001 From: donovaly Date: Sun, 2 Feb 2020 17:16:19 +0100 Subject: [PATCH] [TD] TaskRichAnno tr to fix Qt4 build --- src/Mod/TechDraw/Gui/TaskRichAnno.cpp | 9 +++++++-- src/Mod/TechDraw/Gui/TaskRichAnno.ui | 3 --- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp index eb46263e1e..3eeebcd57e 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.cpp +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.cpp @@ -202,9 +202,14 @@ void TaskRichAnno::setUiPrimary() ui->cpFrameColor->setColor(prefLineColor().asValue()); // set a default font size, use for this the preferences setting - MRichTextEdit mre; + MRichTextEdit mre; ui->teAnnoText->setFontPointSize(mre.getDefFontSizeNum()); - + // set a placeholder text to inform the user + // (QTextEdit has no placeholderText property in Qt4) + #if QT_VERSION >= 0x050200 + ui->teAnnoText->setPlaceholderText(QString::fromLatin1("Input the annotation text directly or start the rich text editor")); + #else + #endif } void TaskRichAnno::enableTextUi(bool b) diff --git a/src/Mod/TechDraw/Gui/TaskRichAnno.ui b/src/Mod/TechDraw/Gui/TaskRichAnno.ui index a16fb15da1..003fc92c2f 100644 --- a/src/Mod/TechDraw/Gui/TaskRichAnno.ui +++ b/src/Mod/TechDraw/Gui/TaskRichAnno.ui @@ -108,9 +108,6 @@ 0 - - Input the annotation text directly or start the rich text editor -