From a3d3e81a86c8c5485506335cb5b8aa0714b69e88 Mon Sep 17 00:00:00 2001 From: James Turner <zakalawe@mac.com> Date: Wed, 25 Feb 2015 23:14:02 +0000 Subject: [PATCH] Set placeholderText from code Avoids a hard requirement of Qt 5.3; only 5.1 is needed. --- src/GUI/Launcher.ui | 3 --- src/GUI/QtLauncher.cxx | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/GUI/Launcher.ui b/src/GUI/Launcher.ui index 4cd666bd9..07d5a0ea8 100644 --- a/src/GUI/Launcher.ui +++ b/src/GUI/Launcher.ui @@ -666,9 +666,6 @@ </property> <item> <widget class="QPlainTextEdit" name="commandLineArgs"> - <property name="placeholderText"> - <string>--option=value --prop:/sim/name=value</string> - </property> </widget> </item> </layout> diff --git a/src/GUI/QtLauncher.cxx b/src/GUI/QtLauncher.cxx index 6964eb9a4..7bc30c8e2 100644 --- a/src/GUI/QtLauncher.cxx +++ b/src/GUI/QtLauncher.cxx @@ -671,6 +671,10 @@ QtLauncher::QtLauncher() : m_ui.reset(new Ui::Launcher); m_ui->setupUi(this); +#if QT_VERSION >= 0x050300 + // don't require Qt 5.3 + m_ui->commandLineArgs->setPlaceholderText("--option=value --prop:/sim/name=value"); +#endif for (int i=0; i<4; ++i) { m_ratingFilters[i] = 3; }