diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
index 107fe40a6a74bf94b6dd40f5978ba500b64fd6d6..9fb075846a1ba3d1d07482f8e6bd1fe7f4b64ca4 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
@@ -40,6 +40,7 @@
 
 #include <QProgressDialog>
 #include <QMessageBox>
+#include <QAbstractButton>
 
 using namespace ProjectExplorer;
 using namespace Qnx::Internal;
@@ -59,10 +60,12 @@ BlackBerryDeviceConfigurationWidget::BlackBerryDeviceConfigurationWidget(const I
     connect(ui->debugToken, SIGNAL(changed(QString)), this, SLOT(updateUploadButton()));
     connect(ui->debugToken, SIGNAL(editingFinished()), this, SLOT(debugTokenEditingFinished()));
     connect(ui->debugToken, SIGNAL(browsingFinished()), this, SLOT(debugTokenEditingFinished()));
-    connect(ui->requestButton, SIGNAL(clicked()), this, SLOT(requestDebugToken()));
-    connect(ui->uploadButton, SIGNAL(clicked()), this, SLOT(uploadDebugToken()));
     connect(uploader, SIGNAL(finished(int)), this, SLOT(uploadFinished(int)));
 
+    ui->debugToken->addButton(tr("Request"), this, SLOT(requestDebugToken()));
+    ui->debugToken->addButton(tr("Upload"), this, SLOT(uploadDebugToken()));
+    uploadButton = ui->debugToken->buttonAtIndex(2);
+
     initGui();
 }
 
@@ -126,7 +129,7 @@ void BlackBerryDeviceConfigurationWidget::uploadDebugToken()
 
 void BlackBerryDeviceConfigurationWidget::updateUploadButton()
 {
-    ui->uploadButton->setEnabled(!ui->debugToken->path().isEmpty());
+    uploadButton->setEnabled(!ui->debugToken->path().isEmpty());
 }
 
 void BlackBerryDeviceConfigurationWidget::uploadFinished(int status)
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.h b/src/plugins/qnx/blackberrydeviceconfigurationwidget.h
index 68353abfbecc686192e7fa586dd14adf96a455e6..18a77b1e9cfbd75ffa78c4d2b975f487b8dc8041 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.h
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.h
@@ -38,6 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 class QProgressDialog;
+class QAbstractButton;
 QT_END_NAMESPACE
 
 namespace Qnx {
@@ -76,6 +77,7 @@ private:
     BlackBerryDeviceConfiguration::Ptr deviceConfiguration() const;
 
     Ui::BlackBerryDeviceConfigurationWidget *ui;
+    QAbstractButton *uploadButton;
 
     QProgressDialog *progressDialog;
 
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.ui b/src/plugins/qnx/blackberrydeviceconfigurationwidget.ui
index 2794b2aabdbf6e1f872b2b29b10704f3750f877a..084ca5d409b43d969b3e7eab31131ec2dc734579 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.ui
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>334</width>
-    <height>109</height>
+    <height>131</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
@@ -67,25 +67,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="Utils::PathChooser" name="debugToken" native="true"/>
-     </item>
-     <item>
-      <widget class="QPushButton" name="requestButton">
-       <property name="text">
-        <string>Request</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="uploadButton">
-       <property name="text">
-        <string>Upload</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
+    <widget class="Utils::PathChooser" name="debugToken" native="true"/>
    </item>
    <item row="3" column="0">
     <widget class="QLabel" name="keyLabel">