summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kaspar <dkaspar@blackberry.com>2014-03-07 17:38:32 +0100
committerDavid Kaspar <dkaspar@blackberry.com>2014-03-07 17:50:50 +0100
commit712d6df4acf4930bd1b679d356e0fbd92c54dad4 (patch)
tree4bdc5820a5913425746cd37a38ed99813373ad35
parentfc1e1d17288ac763c63fef90ac3ddaa6fc4087ea (diff)
downloadqt-creator-712d6df4acf4930bd1b679d356e0fbd92c54dad4.tar.gz
Qnx: Fix for compilation error in c4717944f1c4de116e9074b7a38cd7ff29b1b16d
The QComboBox::setCurrentText() function is in Qt5 only. Using equivalent QComboBox::setEditText() instead. Change-Id: I5d45cc93bbfcaa7510c5192312c74f5f172f3a7d Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: hjk <hjk121@nokiamail.com>
-rw-r--r--src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
index 8911dff023..a611858db4 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
@@ -242,7 +242,7 @@ void BlackBerryDeviceConfigurationWidget::populateDebugTokenCombo(const QString&
{
ui->debugToken->clear();
ui->debugToken->addItems(m_utils.debugTokens());
- ui->debugToken->setCurrentText(current);
+ ui->debugToken->setEditText(current);
}
void BlackBerryDeviceConfigurationWidget::updateDebugTokenCombo()