From 78a2b8a30161fc1c65a1fa802d75911725188532 Mon Sep 17 00:00:00 2001 From: blacksun Date: Thu, 24 Aug 2017 12:38:35 +0000 Subject: [PATCH] Enclose a class function into a macro because available since Qt 5.3 git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5027 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/ui/compositetexteditdialog.cpp | 3 +++ sources/ui/compositetexteditdialog.ui | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sources/ui/compositetexteditdialog.cpp b/sources/ui/compositetexteditdialog.cpp index 54a57658f..2c55b799b 100644 --- a/sources/ui/compositetexteditdialog.cpp +++ b/sources/ui/compositetexteditdialog.cpp @@ -12,6 +12,9 @@ CompositeTextEditDialog::CompositeTextEditDialog(DynamicElementTextItem *text, Q ui->setupUi(this); m_default_text = m_text->compositeText(); ui->m_plain_text_edit->setPlainText(m_default_text); +#if QT_VERSION >= 0x050300 + ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible")); +#endif setUpComboBox(); } diff --git a/sources/ui/compositetexteditdialog.ui b/sources/ui/compositetexteditdialog.ui index 6e1d6edd4..b6258c5f7 100644 --- a/sources/ui/compositetexteditdialog.ui +++ b/sources/ui/compositetexteditdialog.ui @@ -35,11 +35,7 @@ - - - Entrée votre votre texte composé ici, en vous aidant des variables disponible - - +