kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-17 20:50:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enclose a class function into a macro because available since Qt 5.3

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5027 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-08-24 12:38:35 +00:00
parent f202493e11
commit 78a2b8a301
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sources/ui/compositetexteditdialog.cpp
View File

@@ -12,6 +12,9 @@ CompositeTextEditDialog::CompositeTextEditDialog(DynamicElementTextItem *text, Q
ui->setupUi(this); ui->setupUi(this);
m_default_text = m_text->compositeText(); m_default_text = m_text->compositeText();
ui->m_plain_text_edit->setPlainText(m_default_text); 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(); setUpComboBox();
} }

6
sources/ui/compositetexteditdialog.ui
View File

@@ -35,11 +35,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QPlainTextEdit" name="m_plain_text_edit"> <widget class="QPlainTextEdit" name="m_plain_text_edit"/>
<property name="placeholderText">
<string>Entrée votre votre texte composé ici, en vous aidant des variables disponible</string>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>