mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-09-14 20:33:05 +02:00
Remove code minium QT_VERSION 5.9
This commit is contained in:
parent
69ff437368
commit
11a90d2f69
@ -796,13 +796,7 @@ DiagramContext ElementsLocation::elementInformations() const
|
|||||||
QDebug operator<< (QDebug debug, const ElementsLocation &location)
|
QDebug operator<< (QDebug debug, const ElementsLocation &location)
|
||||||
{
|
{
|
||||||
QDebugStateSaver saver(debug);
|
QDebugStateSaver saver(debug);
|
||||||
|
|
||||||
#if QT_VERSION >= 0x050400
|
|
||||||
#pragma message("@TODO remove code for QT 5.04 or later")
|
|
||||||
debug.noquote();
|
debug.noquote();
|
||||||
#else
|
|
||||||
debug.nospace();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
QString msg;
|
QString msg;
|
||||||
msg += "ElementsLocation(";
|
msg += "ElementsLocation(";
|
||||||
|
@ -15,10 +15,7 @@ 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
|
|
||||||
#pragma message("@TODO remove code for QT 5.3 or later")
|
|
||||||
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
|
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
|
||||||
#endif
|
|
||||||
setUpComboBox();
|
setUpComboBox();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -29,10 +26,7 @@ CompositeTextEditDialog::CompositeTextEditDialog(QString text, QWidget *parent)
|
|||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
m_default_text = std::move(text);
|
m_default_text = std::move(text);
|
||||||
ui->m_plain_text_edit->setPlainText(m_default_text);
|
ui->m_plain_text_edit->setPlainText(m_default_text);
|
||||||
#if QT_VERSION >= 0x050300
|
|
||||||
#pragma message("@TODO remove code for QT 5.3 or later")
|
|
||||||
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
|
ui->m_plain_text_edit->setPlaceholderText(tr("Entrée votre texte composé ici, en vous aidant des variables disponible"));
|
||||||
#endif
|
|
||||||
setUpComboBox();
|
setUpComboBox();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,11 +74,8 @@ m_diagram(diagram)
|
|||||||
for(ElementTextItemGroup *grp : groups_list)
|
for(ElementTextItemGroup *grp : groups_list)
|
||||||
setupAnimation(grp, "rotation", grp->rotation(), m_rotation);
|
setupAnimation(grp, "rotation", grp->rotation(), m_rotation);
|
||||||
}
|
}
|
||||||
#if QT_VERSION >= 0x050900
|
|
||||||
else
|
else
|
||||||
setObsolete(true);
|
setObsolete(true);
|
||||||
#pragma message("@TODO remove code for QT 5.9 or later")
|
|
||||||
#endif
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -133,11 +130,8 @@ void RotateTextsCommand::openDialog()
|
|||||||
|
|
||||||
if (ori_text_dialog.exec() == QDialog::Accepted)
|
if (ori_text_dialog.exec() == QDialog::Accepted)
|
||||||
m_rotation = ori_widget->orientation();
|
m_rotation = ori_widget->orientation();
|
||||||
#if QT_VERSION >= 0x050900
|
|
||||||
else
|
else
|
||||||
setObsolete(true);
|
setObsolete(true);
|
||||||
#pragma message("@TODO remove code for QT 5.9 or later")
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void RotateTextsCommand::setupAnimation(QObject *target, const QByteArray &propertyName, const QVariant& start, const QVariant& end)
|
void RotateTextsCommand::setupAnimation(QObject *target, const QByteArray &propertyName, const QVariant& start, const QVariant& end)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user