Qnx: Support multiple BlackBerry target configurations
The new bbndk 10.2 is based on multiple targets (based on multiple bbnk-env scripts). There is no default/common bbnk-env.sh file anymore, and an NDK directory may contain various bbndk-env scripts (i.e targets). This patch makes the BlackBerryConfiguration based on the bbnk-env script path rather than on the NDK path. This will enable having multiple configurations per targets in the same NDK directory. N.B: NDKs 10.1 with one default bbnk-env file are still supported. Change-Id: Icec57c6e722caec7e5ff81e3a9ce4d2cf11f249a Reviewed-by:Tobias Hunger <tobias.hunger@digia.com> Reviewed-by:
Nicolas Arnaud-Cormos <nicolas@kdab.com>
Showing
- src/plugins/qnx/blackberryconfiguration.cpp 15 additions, 7 deletionssrc/plugins/qnx/blackberryconfiguration.cpp
- src/plugins/qnx/blackberryconfiguration.h 3 additions, 2 deletionssrc/plugins/qnx/blackberryconfiguration.h
- src/plugins/qnx/blackberryconfigurationmanager.cpp 19 additions, 6 deletionssrc/plugins/qnx/blackberryconfigurationmanager.cpp
- src/plugins/qnx/blackberryconfigurationmanager.h 1 addition, 1 deletionsrc/plugins/qnx/blackberryconfigurationmanager.h
- src/plugins/qnx/blackberryndksettingswidget.cpp 30 additions, 66 deletionssrc/plugins/qnx/blackberryndksettingswidget.cpp
- src/plugins/qnx/blackberryndksettingswidget.h 2 additions, 5 deletionssrc/plugins/qnx/blackberryndksettingswidget.h
- src/plugins/qnx/blackberryndksettingswidget.ui 166 additions, 5 deletionssrc/plugins/qnx/blackberryndksettingswidget.ui
- src/plugins/qnx/blackberryqtversion.cpp 30 additions, 4 deletionssrc/plugins/qnx/blackberryqtversion.cpp
- src/plugins/qnx/blackberryqtversion.h 5 additions, 0 deletionssrc/plugins/qnx/blackberryqtversion.h
- src/plugins/qnx/qnxutils.cpp 3 additions, 3 deletionssrc/plugins/qnx/qnxutils.cpp
- src/plugins/qnx/qnxutils.h 2 additions, 2 deletionssrc/plugins/qnx/qnxutils.h
Loading
Please register or sign in to comment