src/plugins/qnx · 921bf4b8613c6035e91d66eec6dfe5a5825972cd · Marco Bubke / flatpak-qt-creator

Merge remote-tracking branch 'origin/3.1'

Eike Ziller authored 10 years ago

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cpptools/cppcompletion_test.cpp

Change-Id: Ic5e75b3ef164de664a1449ffa8579beaf5b02521

b6876586

History

b6876586 10 years ago

History

Name	Last commit	Last update
..
cascadesimport
images
Qnx.pluginspec.in
bardescriptordocument.cpp
bardescriptordocument.h
bardescriptoreditor.cpp
bardescriptoreditor.h
bardescriptoreditorabstractpanelwidget.cpp
bardescriptoreditorabstractpanelwidget.h
bardescriptoreditorassetswidget.cpp
bardescriptoreditorassetswidget.h
bardescriptoreditorassetswidget.ui
bardescriptoreditorauthorinformationwidget.cpp
bardescriptoreditorauthorinformationwidget.h
bardescriptoreditorauthorinformationwidget.ui
bardescriptoreditorentrypointwidget.cpp
bardescriptoreditorentrypointwidget.h
bardescriptoreditorentrypointwidget.ui
bardescriptoreditorenvironmentwidget.cpp
bardescriptoreditorenvironmentwidget.h
bardescriptoreditorenvironmentwidget.ui
bardescriptoreditorfactory.cpp
bardescriptoreditorfactory.h
bardescriptoreditorgeneralwidget.cpp
bardescriptoreditorgeneralwidget.h
bardescriptoreditorgeneralwidget.ui
bardescriptoreditorpackageinformationwidget.cpp
bardescriptoreditorpackageinformationwidget.h
bardescriptoreditorpackageinformationwidget.ui
bardescriptoreditorpermissionswidget.cpp
bardescriptoreditorpermissionswidget.h
bardescriptoreditorpermissionswidget.ui
bardescriptoreditorwidget.cpp
bardescriptoreditorwidget.h
bardescriptorfilenode.cpp
bardescriptorfilenode.h
bardescriptorfilenodemanager.cpp
bardescriptorfilenodemanager.h
bardescriptormagicmatcher.cpp
bardescriptormagicmatcher.h
bardescriptorpermissionsmodel.cpp
bardescriptorpermissionsmodel.h
blackberryabstractdeploystep.cpp
blackberryabstractdeploystep.h
blackberryapilevelconfiguration.cpp
blackberryapilevelconfiguration.h
blackberryapplicationrunner.cpp
blackberryapplicationrunner.h
blackberrycertificate.cpp
blackberrycertificate.h
blackberrycheckdevicestatusstep.cpp
blackberrycheckdevicestatusstep.h
blackberrycheckdevicestatusstepconfigwidget.cpp
blackberrycheckdevicestatusstepconfigwidget.h
blackberrycheckdevicestatusstepconfigwidget.ui
blackberrycheckdevicestatusstepfactory.cpp
blackberrycheckdevicestatusstepfactory.h
blackberryconfigurationmanager.cpp
blackberryconfigurationmanager.h
blackberrycreatecertificatedialog.cpp
blackberrycreatecertificatedialog.h
blackberrycreatecertificatedialog.ui
blackberrycreatepackagestep.cpp
blackberrycreatepackagestep.h
blackberrycreatepackagestepconfigwidget.cpp
blackberrycreatepackagestepconfigwidget.h
blackberrycreatepackagestepconfigwidget.ui
blackberrycreatepackagestepfactory.cpp
blackberrycreatepackagestepfactory.h
blackberrydebugsupport.cpp
blackberrydebugsupport.h
blackberrydebugtokenpinsdialog.cpp
blackberrydebugtokenpinsdialog.h
blackberrydebugtokenpinsdialog.ui
blackberrydebugtokenreader.cpp
blackberrydebugtokenreader.h
blackberrydebugtokenrequestdialog.cpp
blackberrydebugtokenrequestdialog.h
blackberrydebugtokenrequestdialog.ui
blackberrydebugtokenrequester.cpp
blackberrydebugtokenrequester.h
blackberrydebugtokenuploader.cpp
blackberrydebugtokenuploader.h
blackberrydeployconfiguration.cpp
blackberrydeployconfiguration.h
blackberrydeployconfigurationfactory.cpp
blackberrydeployconfigurationfactory.h
blackberrydeployconfigurationwidget.cpp
blackberrydeployconfigurationwidget.h
blackberrydeployconfigurationwidget.ui
blackberrydeployinformation.cpp
blackberrydeployinformation.h
blackberrydeployqtlibrariesdialog.cpp
blackberrydeployqtlibrariesdialog.h
blackberrydeployqtlibrariesdialog.ui
blackberrydeploystep.cpp
blackberrydeploystep.h
blackberrydeploystepconfigwidget.cpp
blackberrydeploystepconfigwidget.h
blackberrydeploystepfactory.cpp