forked from qt-creator/qt-creator
Android: Read NDK and api versions from modules/Core.json
Qt 6.5+ writes the NDK version that was used for building Qt into modules/Core.json. With this change, Qt Creator, now reads this version and (if present) prefers it over the respective NDK version defined by Qt Creator's own sdk_definition.json. The order of preference for an NDK version being required and used for a Qt version is now: 1) NDK that was manually set as "Default" 2) NDK defined by Qt's modules/Core.json 3) NDK version defined for a Qt version by sdk_definition.json 4) Default/fallback NDK version defined by sdk_definition.json Task-number: QTCREATORBUG-28629 Change-Id: I2a0a9b3a1719139dc937d468e1dd3643289510a1 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
@@ -27,6 +27,8 @@ private slots:
|
||||
void testAndroidSdkManagerProgressParser();
|
||||
void testAndroidConfigAvailableNdkPlatforms_data();
|
||||
void testAndroidConfigAvailableNdkPlatforms();
|
||||
void testAndroidQtVersionParseBuiltWith_data();
|
||||
void testAndroidQtVersionParseBuiltWith();
|
||||
#endif // WITH_TESTS
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user