Merge lp://staging/~zeller-benjamin/qtcreator-plugin-remotelinux/qt53migrate into lp://staging/qtcreator-plugin-remotelinux

Proposed by Benjamin Zeller
Status: Merged
Merged at revision: 12
Proposed branch: lp://staging/~zeller-benjamin/qtcreator-plugin-remotelinux/qt53migrate
Merge into: lp://staging/qtcreator-plugin-remotelinux
Diff against target: 18661 lines (+8335/-5585)
217 files modified
debian/changelog (+6/-0)
debian/control (+5/-5)
share/qtcreator/templates/wizards/bb-bardescriptor/bar-descriptor.xml (+2/-4)
share/qtcreator/templates/wizards/bb-cascades-app/bar-descriptor.xml (+0/-2)
share/qtcreator/templates/wizards/bb-cascades-app/wizard.xml (+1/-1)
share/qtcreator/templates/wizards/bb-qt5-bardescriptor/bar-descriptor.xml (+0/-22)
src/qnx/bardescriptordocument.cpp (+559/-127)
src/qnx/bardescriptordocument.h (+76/-13)
src/qnx/bardescriptordocumentnodehandlers.cpp (+0/-708)
src/qnx/bardescriptordocumentnodehandlers.h (+0/-302)
src/qnx/bardescriptoreditor.cpp (+48/-34)
src/qnx/bardescriptoreditor.h (+6/-2)
src/qnx/bardescriptoreditorabstractpanelwidget.cpp (+84/-36)
src/qnx/bardescriptoreditorabstractpanelwidget.h (+21/-10)
src/qnx/bardescriptoreditorassetswidget.cpp (+42/-42)
src/qnx/bardescriptoreditorassetswidget.h (+7/-12)
src/qnx/bardescriptoreditorauthorinformationwidget.cpp (+11/-26)
src/qnx/bardescriptoreditorauthorinformationwidget.h (+3/-10)
src/qnx/bardescriptoreditorentrypointwidget.cpp (+46/-67)
src/qnx/bardescriptoreditorentrypointwidget.h (+5/-17)
src/qnx/bardescriptoreditorenvironmentwidget.cpp (+21/-20)
src/qnx/bardescriptoreditorenvironmentwidget.h (+4/-7)
src/qnx/bardescriptoreditorfactory.cpp (+10/-14)
src/qnx/bardescriptoreditorfactory.h (+2/-10)
src/qnx/bardescriptoreditorgeneralwidget.cpp (+41/-62)
src/qnx/bardescriptoreditorgeneralwidget.h (+4/-16)
src/qnx/bardescriptoreditorpackageinformationwidget.cpp (+3/-46)
src/qnx/bardescriptoreditorpackageinformationwidget.h (+1/-14)
src/qnx/bardescriptoreditorpermissionswidget.cpp (+26/-10)
src/qnx/bardescriptoreditorpermissionswidget.h (+5/-5)
src/qnx/bardescriptoreditorwidget.cpp (+61/-112)
src/qnx/bardescriptoreditorwidget.h (+10/-34)
src/qnx/blackberryabstractdeploystep.h (+1/-3)
src/qnx/blackberryapilevelconfiguration.cpp (+504/-0)
src/qnx/blackberryapilevelconfiguration.h (+125/-0)
src/qnx/blackberryapplicationrunner.cpp (+186/-8)
src/qnx/blackberryapplicationrunner.h (+29/-7)
src/qnx/blackberrycertificate.cpp (+2/-2)
src/qnx/blackberrycheckdevicestatusstep.cpp (+278/-0)
src/qnx/blackberrycheckdevicestatusstep.h (+93/-0)
src/qnx/blackberrycheckdevicestatusstepconfigwidget.cpp (+73/-0)
src/qnx/blackberrycheckdevicestatusstepconfigwidget.h (+63/-0)
src/qnx/blackberrycheckdevicestatusstepconfigwidget.ui (+35/-0)
src/qnx/blackberrycheckdevicestatusstepfactory.cpp (+110/-0)
src/qnx/blackberrycheckdevicestatusstepfactory.h (+64/-0)
src/qnx/blackberrycheckdevmodestep.cpp (+0/-110)
src/qnx/blackberrycheckdevmodestep.h (+0/-63)
src/qnx/blackberrycheckdevmodestepconfigwidget.cpp (+0/-55)
src/qnx/blackberrycheckdevmodestepconfigwidget.h (+0/-55)
src/qnx/blackberrycheckdevmodestepfactory.cpp (+0/-108)
src/qnx/blackberrycheckdevmodestepfactory.h (+0/-64)
src/qnx/blackberryconfiguration.cpp (+0/-389)
src/qnx/blackberryconfiguration.h (+0/-111)
src/qnx/blackberryconfigurationmanager.cpp (+304/-176)
src/qnx/blackberryconfigurationmanager.h (+46/-19)
src/qnx/blackberrycreatecertificatedialog.cpp (+1/-1)
src/qnx/blackberrycreatepackagestep.cpp (+164/-65)
src/qnx/blackberrycreatepackagestep.h (+15/-0)
src/qnx/blackberrycreatepackagestepconfigwidget.cpp (+82/-7)
src/qnx/blackberrycreatepackagestepconfigwidget.h (+6/-3)
src/qnx/blackberrycreatepackagestepconfigwidget.ui (+161/-4)
src/qnx/blackberrydebugsupport.cpp (+6/-1)
src/qnx/blackberrydebugtokenpinsdialog.cpp (+173/-0)
src/qnx/blackberrydebugtokenpinsdialog.h (+79/-0)
src/qnx/blackberrydebugtokenpinsdialog.ui (+144/-0)
src/qnx/blackberrydebugtokenreader.cpp (+24/-0)
src/qnx/blackberrydebugtokenreader.h (+2/-0)
src/qnx/blackberrydebugtokenrequestdialog.cpp (+22/-3)
src/qnx/blackberrydebugtokenrequester.cpp (+10/-6)
src/qnx/blackberrydeployconfiguration.cpp (+6/-5)
src/qnx/blackberrydeployconfiguration.h (+1/-3)
src/qnx/blackberrydeployconfigurationfactory.cpp (+2/-2)
src/qnx/blackberrydeployconfigurationfactory.h (+1/-3)
src/qnx/blackberrydeployconfigurationwidget.cpp (+2/-0)
src/qnx/blackberrydeployconfigurationwidget.h (+1/-3)
src/qnx/blackberrydeployinformation.h (+1/-3)
src/qnx/blackberrydeployqtlibrariesdialog.cpp (+298/-0)
src/qnx/blackberrydeployqtlibrariesdialog.h (+109/-0)
src/qnx/blackberrydeployqtlibrariesdialog.ui (+117/-0)
src/qnx/blackberrydeviceconfiguration.cpp (+13/-4)
src/qnx/blackberrydeviceconfiguration.h (+1/-3)
src/qnx/blackberrydeviceconfigurationwidget.cpp (+52/-19)
src/qnx/blackberrydeviceconfigurationwidget.h (+6/-3)
src/qnx/blackberrydeviceconfigurationwidget.ui (+16/-17)
src/qnx/blackberrydeviceconfigurationwizardconfigpage.ui (+13/-15)
src/qnx/blackberrydeviceconfigurationwizardpages.cpp (+39/-17)
src/qnx/blackberrydeviceconfigurationwizardpages.h (+4/-3)
src/qnx/blackberrydeviceconnection.cpp (+1/-2)
src/qnx/blackberrydeviceconnectionmanager.cpp (+5/-5)
src/qnx/blackberrydeviceinformation.cpp (+11/-2)
src/qnx/blackberrydeviceinformation.h (+2/-0)
src/qnx/blackberrydevicelistdetector.cpp (+1/-1)
src/qnx/blackberryimportcertificatedialog.cpp (+1/-0)
src/qnx/blackberryinstallwizard.cpp (+3/-0)
src/qnx/blackberryinstallwizard.h (+11/-3)
src/qnx/blackberryinstallwizardoptionpage.ui (+97/-0)
src/qnx/blackberryinstallwizardpages.cpp (+88/-39)
src/qnx/blackberryinstallwizardpages.h (+9/-7)
src/qnx/blackberryinstallwizardtargetpage.ui (+1/-1)
src/qnx/blackberrykeyspage.cpp (+5/-2)
src/qnx/blackberrykeyspage.h (+4/-2)
src/qnx/blackberrykeyswidget.cpp (+213/-35)
src/qnx/blackberrykeyswidget.h (+19/-2)
src/qnx/blackberrykeyswidget.ui (+68/-13)
src/qnx/blackberrylogprocessrunner.h (+1/-3)
src/qnx/blackberryndkprocess.cpp (+4/-3)
src/qnx/blackberryndkprocess.h (+1/-0)
src/qnx/blackberryndksettingspage.cpp (+11/-6)
src/qnx/blackberryndksettingspage.h (+4/-2)
src/qnx/blackberryndksettingswidget.cpp (+342/-213)
src/qnx/blackberryndksettingswidget.h (+27/-18)
src/qnx/blackberryndksettingswidget.ui (+188/-346)
src/qnx/blackberrypotentialkit.cpp (+119/-0)
src/qnx/blackberrypotentialkit.h (+62/-0)
src/qnx/blackberryqtversionfactory.cpp (+2/-1)
src/qnx/blackberryrunconfiguration.h (+1/-3)
src/qnx/blackberryrunconfigurationwidget.h (+1/-3)
src/qnx/blackberryruncontrol.cpp (+1/-1)
src/qnx/blackberryruncontrol.h (+1/-3)
src/qnx/blackberryruncontrolfactory.cpp (+53/-1)
src/qnx/blackberryruncontrolfactory.h (+1/-3)
src/qnx/blackberryruntimeconfiguration.cpp (+95/-0)
src/qnx/blackberryruntimeconfiguration.h (+62/-0)
src/qnx/blackberrysetuppage.cpp (+67/-0)
src/qnx/blackberrysetuppage.h (+59/-0)
src/qnx/blackberrysetupwidget.cpp (+333/-0)
src/qnx/blackberrysetupwidget.h (+143/-0)
src/qnx/blackberrysetupwizard.cpp (+0/-503)
src/qnx/blackberrysetupwizard.h (+0/-146)
src/qnx/blackberrysetupwizardcertificatepage.ui (+0/-108)
src/qnx/blackberrysetupwizarddevicepage.ui (+0/-134)
src/qnx/blackberrysetupwizardfinishpage.ui (+0/-64)
src/qnx/blackberrysetupwizardkeyspage.ui (+0/-310)
src/qnx/blackberrysetupwizardpages.cpp (+3/-2)
src/qnx/blackberrysetupwizardpages.h (+0/-167)
src/qnx/blackberrysigningpasswordsdialog.h (+1/-3)
src/qnx/blackberrysigningutils.cpp (+148/-38)
src/qnx/blackberrysigningutils.h (+25/-4)
src/qnx/blackberrysshkeysgenerator.h (+1/-3)
src/qnx/blackberryversionnumber.cpp (+125/-0)
src/qnx/blackberryversionnumber.h (+64/-0)
src/qnx/cascadesimport/cascadesimport.pri (+2/-0)
src/qnx/cascadesimport/cascadesimportwizard.cpp (+2/-7)
src/qnx/cascadesimport/cascadesimportwizard.h (+4/-7)
src/qnx/cascadesimport/fileconverter.h (+1/-3)
src/qnx/cascadesimport/srcprojectpathchooser.cpp (+77/-0)
src/qnx/cascadesimport/srcprojectpathchooser.h (+53/-0)
src/qnx/cascadesimport/srcprojectwizardpage.ui (+5/-5)
src/qnx/pathchooserdelegate.cpp (+6/-0)
src/qnx/pathchooserdelegate.h (+3/-0)
src/qnx/qnx.pro (+33/-22)
src/qnx/qnx.qbs (+39/-22)
src/qnx/qnx.qrc (+4/-0)
src/qnx/qnx_dependencies.pri (+6/-0)
src/qnx/qnxanalyzesupport.cpp (+27/-2)
src/qnx/qnxanalyzesupport.h (+6/-1)
src/qnx/qnxattachdebugdialog.cpp (+71/-0)
src/qnx/qnxattachdebugdialog.h (+59/-0)
src/qnx/qnxattachdebugsupport.cpp (+174/-0)
src/qnx/qnxattachdebugsupport.h (+89/-0)
src/qnx/qnxbaseqtconfigwidget.cpp (+1/-0)
src/qnx/qnxbaseqtconfigwidget.h (+1/-3)
src/qnx/qnxconstants.h (+23/-1)
src/qnx/qnxdevicetester.h (+1/-3)
src/qnx/qnxplugin.cpp (+405/-15)
src/qnx/qnxplugin.h (+24/-3)
src/qnx/qnxrunconfiguration.cpp (+10/-1)
src/qnx/qnxruncontrolfactory.cpp (+8/-7)
src/qnx/qnxtoolchain.cpp (+11/-6)
src/qnx/qnxutils.cpp (+5/-3)
src/qnx/qnxutils.h (+6/-1)
src/qnx/slog2inforunner.cpp (+2/-2)
src/qnx/slog2inforunner.h (+1/-3)
src/remotelinux/abstractremotelinuxdeployservice.cpp (+8/-2)
src/remotelinux/abstractremotelinuxdeployservice.h (+2/-0)
src/remotelinux/abstractremotelinuxdeploystep.h (+1/-3)
src/remotelinux/abstractuploadandinstallpackageservice.h (+1/-3)
src/remotelinux/genericdirectuploadservice.cpp (+3/-3)
src/remotelinux/genericdirectuploadservice.h (+1/-1)
src/remotelinux/genericdirectuploadstep.h (+1/-3)
src/remotelinux/genericlinuxdeviceconfigurationwidget.cpp (+1/-0)
src/remotelinux/genericlinuxdeviceconfigurationwidget.h (+1/-3)
src/remotelinux/genericlinuxdeviceconfigurationwidget.ui (+1/-1)
src/remotelinux/genericlinuxdeviceconfigurationwizard.h (+1/-3)
src/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp (+1/-0)
src/remotelinux/linuxdeviceprocess.cpp (+1/-1)
src/remotelinux/linuxdevicetester.h (+1/-3)
src/remotelinux/packageuploader.cpp (+3/-3)
src/remotelinux/packageuploader.h (+1/-1)
src/remotelinux/publickeydeploymentdialog.h (+1/-3)
src/remotelinux/remotelinux.qbs (+5/-3)
src/remotelinux/remotelinux_dependencies.pri (+5/-0)
src/remotelinux/remotelinuxanalyzesupport.cpp (+1/-1)
src/remotelinux/remotelinuxcustomcommanddeployservice.h (+1/-3)
src/remotelinux/remotelinuxdebugsupport.cpp (+0/-4)
src/remotelinux/remotelinuxdeployconfigurationwidget.h (+1/-3)
src/remotelinux/remotelinuxenvironmentreader.cpp (+1/-1)
src/remotelinux/remotelinuxpackageinstaller.h (+1/-3)
src/remotelinux/remotelinuxrunconfiguration.cpp (+1/-14)
src/remotelinux/remotelinuxrunconfiguration.h (+0/-2)
src/remotelinux/remotelinuxrunconfigurationwidget.h (+1/-3)
src/remotelinux/sshkeydeployer.h (+2/-6)
src/remotelinux/uploadandinstalltarpackagestep.h (+1/-3)
src/valgrind/callgrindtextmark.h (+1/-3)
src/valgrind/callgrindtool.cpp (+4/-4)
src/valgrind/callgrindvisualisation.h (+1/-3)
src/valgrind/memcheckerrorview.cpp (+2/-0)
src/valgrind/memchecktool.cpp (+6/-0)
src/valgrind/suppressiondialog.cpp (+1/-0)
src/valgrind/valgrind.qbs (+5/-3)
src/valgrind/valgrind_dependencies.pri (+2/-0)
src/valgrind/valgrindconfigwidget.cpp (+1/-0)
src/valgrind/valgrindconfigwidget.h (+1/-3)
src/valgrind/valgrindconfigwidget.ui (+7/-10)
src/valgrind/valgrindplugin.cpp (+16/-4)
src/valgrind/valgrindprocess.cpp (+1/-6)
src/valgrind/xmlprotocol/errorlistmodel.cpp (+1/-1)
To merge this branch: bzr merge lp://staging/~zeller-benjamin/qtcreator-plugin-remotelinux/qt53migrate
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+223197@code.staging.launchpad.net

Commit message

Migrating to Qt5.3 and QtC 3.1

Description of the change

Migrating to Qt5.3 and QtC 3.1

To post a comment you must log in.
11. By Benjamin Zeller

Update package versions

12. By Benjamin Zeller

Merge

13. By Benjamin Zeller

Version bump

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches