~ubuntu-sdk-team/qtcreator-plugin-remotelinux/trunk

« back to all changes in this revision

Viewing changes to src/qnx/blackberrydeviceconnectionmanager.cpp

Committer: CI bot
Author(s): Benjamin Zeller
Date: 2014-06-16 10:28:43 UTC
mfrom: (4.2.4 remotelinux)
Revision ID: ps-jenkins@lists.canonical.com-20140616102843-8juvmjvzwlzsboyw

Migrating to Qt5.3 and QtC 3.1

files added:
src/qnx/blackberryapilevelconfiguration.cpp

src/qnx/blackberryapilevelconfiguration.h

src/qnx/blackberrycheckdevicestatusstep.cpp

src/qnx/blackberrycheckdevicestatusstep.h

src/qnx/blackberrycheckdevicestatusstepconfigwidget.cpp

src/qnx/blackberrycheckdevicestatusstepconfigwidget.h

src/qnx/blackberrycheckdevicestatusstepconfigwidget.ui

src/qnx/blackberrycheckdevicestatusstepfactory.cpp

src/qnx/blackberrycheckdevicestatusstepfactory.h

src/qnx/blackberrydebugtokenpinsdialog.cpp

src/qnx/blackberrydebugtokenpinsdialog.h

src/qnx/blackberrydebugtokenpinsdialog.ui

src/qnx/blackberrydeployqtlibrariesdialog.cpp

src/qnx/blackberrydeployqtlibrariesdialog.h

src/qnx/blackberrydeployqtlibrariesdialog.ui

src/qnx/blackberryinstallwizardoptionpage.ui

src/qnx/blackberrypotentialkit.cpp

src/qnx/blackberrypotentialkit.h

src/qnx/blackberryruntimeconfiguration.cpp

src/qnx/blackberryruntimeconfiguration.h

src/qnx/blackberrysetuppage.cpp

src/qnx/blackberrysetuppage.h

src/qnx/blackberrysetupwidget.cpp

src/qnx/blackberrysetupwidget.h

src/qnx/blackberryversionnumber.cpp

src/qnx/blackberryversionnumber.h

src/qnx/cascadesimport/srcprojectpathchooser.cpp

src/qnx/cascadesimport/srcprojectpathchooser.h

src/qnx/images/error.png

src/qnx/images/info.png

src/qnx/images/ok.png

src/qnx/images/warning.png

src/qnx/qnxattachdebugdialog.cpp

src/qnx/qnxattachdebugdialog.h

src/qnx/qnxattachdebugsupport.cpp

src/qnx/qnxattachdebugsupport.h

files removed:
src/qnx/bardescriptordocumentnodehandlers.cpp

src/qnx/bardescriptordocumentnodehandlers.h

src/qnx/blackberrycheckdevmodestep.cpp

src/qnx/blackberrycheckdevmodestep.h

src/qnx/blackberrycheckdevmodestepconfigwidget.cpp

src/qnx/blackberrycheckdevmodestepconfigwidget.h

src/qnx/blackberrycheckdevmodestepfactory.cpp

src/qnx/blackberrycheckdevmodestepfactory.h

src/qnx/blackberryconfiguration.cpp

src/qnx/blackberryconfiguration.h

src/qnx/blackberrysetupwizard.cpp

src/qnx/blackberrysetupwizard.h

src/qnx/blackberrysetupwizardcertificatepage.ui

src/qnx/blackberrysetupwizarddevicepage.ui

src/qnx/blackberrysetupwizardfinishpage.ui

src/qnx/blackberrysetupwizardkeyspage.ui

src/qnx/blackberrysetupwizardpages.h

files modified:
debian/changelog

debian/control

share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml

share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml

share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml

share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml

src/qnx/bardescriptordocument.cpp

src/qnx/bardescriptordocument.h

src/qnx/bardescriptoreditor.cpp

src/qnx/bardescriptoreditor.h

src/qnx/bardescriptoreditorabstractpanelwidget.cpp

src/qnx/bardescriptoreditorabstractpanelwidget.h

src/qnx/bardescriptoreditorassetswidget.cpp

src/qnx/bardescriptoreditorassetswidget.h

src/qnx/bardescriptoreditorauthorinformationwidget.cpp

src/qnx/bardescriptoreditorauthorinformationwidget.h

src/qnx/bardescriptoreditorentrypointwidget.cpp

src/qnx/bardescriptoreditorentrypointwidget.h

src/qnx/bardescriptoreditorenvironmentwidget.cpp

src/qnx/bardescriptoreditorenvironmentwidget.h

src/qnx/bardescriptoreditorfactory.cpp

src/qnx/bardescriptoreditorfactory.h

src/qnx/bardescriptoreditorgeneralwidget.cpp

src/qnx/bardescriptoreditorgeneralwidget.h

src/qnx/bardescriptoreditorpackageinformationwidget.cpp

src/qnx/bardescriptoreditorpackageinformationwidget.h

src/qnx/bardescriptoreditorpermissionswidget.cpp

src/qnx/bardescriptoreditorpermissionswidget.h

src/qnx/bardescriptoreditorwidget.cpp

src/qnx/bardescriptoreditorwidget.h

src/qnx/blackberryabstractdeploystep.h

src/qnx/blackberryapplicationrunner.cpp

src/qnx/blackberryapplicationrunner.h

src/qnx/blackberrycertificate.cpp

src/qnx/blackberryconfigurationmanager.cpp

src/qnx/blackberryconfigurationmanager.h

src/qnx/blackberrycreatecertificatedialog.cpp

src/qnx/blackberrycreatepackagestep.cpp

src/qnx/blackberrycreatepackagestep.h

src/qnx/blackberrycreatepackagestepconfigwidget.cpp

src/qnx/blackberrycreatepackagestepconfigwidget.h

src/qnx/blackberrycreatepackagestepconfigwidget.ui

src/qnx/blackberrydebugsupport.cpp

src/qnx/blackberrydebugtokenreader.cpp

src/qnx/blackberrydebugtokenreader.h

src/qnx/blackberrydebugtokenrequestdialog.cpp

src/qnx/blackberrydebugtokenrequester.cpp

src/qnx/blackberrydeployconfiguration.cpp

src/qnx/blackberrydeployconfiguration.h

src/qnx/blackberrydeployconfigurationfactory.cpp

src/qnx/blackberrydeployconfigurationfactory.h

src/qnx/blackberrydeployconfigurationwidget.cpp

src/qnx/blackberrydeployconfigurationwidget.h

src/qnx/blackberrydeployinformation.h

src/qnx/blackberrydeviceconfiguration.cpp

src/qnx/blackberrydeviceconfiguration.h

src/qnx/blackberrydeviceconfigurationwidget.cpp

src/qnx/blackberrydeviceconfigurationwidget.h

src/qnx/blackberrydeviceconfigurationwidget.ui

src/qnx/blackberrydeviceconfigurationwizardconfigpage.ui

src/qnx/blackberrydeviceconfigurationwizardpages.cpp

src/qnx/blackberrydeviceconfigurationwizardpages.h

src/qnx/blackberrydeviceconnection.cpp

src/qnx/blackberrydeviceconnectionmanager.cpp

src/qnx/blackberrydeviceinformation.cpp

src/qnx/blackberrydeviceinformation.h

src/qnx/blackberrydevicelistdetector.cpp

src/qnx/blackberryimportcertificatedialog.cpp

src/qnx/blackberryinstallwizard.cpp

src/qnx/blackberryinstallwizard.h

src/qnx/blackberryinstallwizardpages.cpp

src/qnx/blackberryinstallwizardpages.h

src/qnx/blackberryinstallwizardtargetpage.ui

src/qnx/blackberrykeyspage.cpp

src/qnx/blackberrykeyspage.h

src/qnx/blackberrykeyswidget.cpp

src/qnx/blackberrykeyswidget.h

src/qnx/blackberrykeyswidget.ui

src/qnx/blackberrylogprocessrunner.h

src/qnx/blackberryndkprocess.cpp

src/qnx/blackberryndkprocess.h

src/qnx/blackberryndksettingspage.cpp

src/qnx/blackberryndksettingspage.h

src/qnx/blackberryndksettingswidget.cpp

src/qnx/blackberryndksettingswidget.h

src/qnx/blackberryndksettingswidget.ui

src/qnx/blackberryqtversionfactory.cpp

src/qnx/blackberryrunconfiguration.h

src/qnx/blackberryrunconfigurationwidget.h

src/qnx/blackberryruncontrol.cpp

src/qnx/blackberryruncontrol.h

src/qnx/blackberryruncontrolfactory.cpp

src/qnx/blackberryruncontrolfactory.h

src/qnx/blackberrysetupwizardpages.cpp

src/qnx/blackberrysigningpasswordsdialog.h

src/qnx/blackberrysigningutils.cpp

src/qnx/blackberrysigningutils.h

src/qnx/blackberrysshkeysgenerator.h

src/qnx/cascadesimport/cascadesimport.pri

src/qnx/cascadesimport/cascadesimportwizard.cpp

src/qnx/cascadesimport/cascadesimportwizard.h

src/qnx/cascadesimport/fileconverter.h

src/qnx/cascadesimport/srcprojectwizardpage.ui

src/qnx/pathchooserdelegate.cpp

src/qnx/pathchooserdelegate.h

src/qnx/qnx.pro

src/qnx/qnx.qbs

src/qnx/qnx.qrc

src/qnx/qnx_dependencies.pri

src/qnx/qnxanalyzesupport.cpp

src/qnx/qnxanalyzesupport.h

src/qnx/qnxbaseqtconfigwidget.cpp

src/qnx/qnxbaseqtconfigwidget.h

src/qnx/qnxconstants.h

src/qnx/qnxdevicetester.h

src/qnx/qnxplugin.cpp

src/qnx/qnxplugin.h

src/qnx/qnxrunconfiguration.cpp

src/qnx/qnxruncontrolfactory.cpp

src/qnx/qnxtoolchain.cpp

src/qnx/qnxutils.cpp

src/qnx/qnxutils.h

src/qnx/slog2inforunner.cpp

src/qnx/slog2inforunner.h

src/remotelinux/abstractremotelinuxdeployservice.cpp

src/remotelinux/abstractremotelinuxdeployservice.h

src/remotelinux/abstractremotelinuxdeploystep.h

src/remotelinux/abstractuploadandinstallpackageservice.h

src/remotelinux/genericdirectuploadservice.cpp

src/remotelinux/genericdirectuploadservice.h

src/remotelinux/genericdirectuploadstep.h

src/remotelinux/genericlinuxdeviceconfigurationwidget.cpp

src/remotelinux/genericlinuxdeviceconfigurationwidget.h

src/remotelinux/genericlinuxdeviceconfigurationwidget.ui

src/remotelinux/genericlinuxdeviceconfigurationwizard.h

src/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp

src/remotelinux/linuxdeviceprocess.cpp

src/remotelinux/linuxdevicetester.h

src/remotelinux/packageuploader.cpp

src/remotelinux/packageuploader.h

src/remotelinux/publickeydeploymentdialog.h

src/remotelinux/remotelinux.qbs

src/remotelinux/remotelinux_dependencies.pri

src/remotelinux/remotelinuxanalyzesupport.cpp

src/remotelinux/remotelinuxcustomcommanddeployservice.h

src/remotelinux/remotelinuxdebugsupport.cpp

src/remotelinux/remotelinuxdeployconfigurationwidget.h

src/remotelinux/remotelinuxenvironmentreader.cpp

src/remotelinux/remotelinuxpackageinstaller.h

src/remotelinux/remotelinuxrunconfiguration.cpp

src/remotelinux/remotelinuxrunconfiguration.h

src/remotelinux/remotelinuxrunconfigurationwidget.h

src/remotelinux/sshkeydeployer.h

src/remotelinux/uploadandinstalltarpackagestep.h

src/valgrind/callgrindtextmark.h

src/valgrind/callgrindtool.cpp

src/valgrind/callgrindvisualisation.h

src/valgrind/memcheckerrorview.cpp

src/valgrind/memchecktool.cpp

src/valgrind/suppressiondialog.cpp

src/valgrind/valgrind.qbs

src/valgrind/valgrind_dependencies.pri

src/valgrind/valgrindconfigwidget.cpp

src/valgrind/valgrindconfigwidget.h

src/valgrind/valgrindconfigwidget.ui

src/valgrind/valgrindplugin.cpp

src/valgrind/valgrindprocess.cpp

src/valgrind/xmlprotocol/errorlistmodel.cpp

Show diffs side-by-side

added added

removed removed

src/qnx/blackberrydeviceconnectionmanager.cpp

114

// BlackBerry Device connection needs the Qnx environments to be set

115

// in order to find the Connect.jar package.

116

// Let's delay the device connections at startup till the Qnx settings are loaded.

117

if (BlackBerryConfigurationManager::instance().configurations().isEmpty()) {

117

if (BlackBerryConfigurationManager::instance()->apiLevels().isEmpty()) {

118

m_pendingDeviceConnections << device;

119

connect(&BlackBerryConfigurationManager::instance(), SIGNAL(settingsLoaded()),

119

connect(BlackBerryConfigurationManager::instance(), SIGNAL(settingsLoaded()),

120

this, SLOT(processPendingDeviceConnections()), Qt::UniqueConnection);

121

return;

122

}

187

188

const QString BlackBerryDeviceConnectionManager::privateKeyPath() const

189

{

190

return QFileInfo(Core::ICore::settings()->fileName()).absolutePath() + QLatin1String("/qtcreator/qnx/id_rsa");

190

return Core::ICore::userResourcePath() + QLatin1String("/qnx/id_rsa");

191

}

192

193

/*!

308

void BlackBerryDeviceConnectionManager::processPendingDeviceConnections()

309

{

310

if (m_pendingDeviceConnections.isEmpty()

311

|| BlackBerryConfigurationManager::instance().configurations().isEmpty())

311

|| BlackBerryConfigurationManager::instance()->apiLevels().isEmpty())

312

return;

313

314

foreach (ProjectExplorer::IDevice::ConstPtr device, m_pendingDeviceConnections)

315

connectDevice(device);

316

317

m_pendingDeviceConnections.clear();

318

disconnect(&BlackBerryConfigurationManager::instance(), SIGNAL(settingsLoaded()),

318

disconnect(BlackBerryConfigurationManager::instance(), SIGNAL(settingsLoaded()),

319

this, SLOT(processPendingDeviceConnections()));

320

}

321

Older »