summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Keller <rainer.keller@theqtcompany.com>2015-04-22 13:43:50 +0200
committerRainer Keller <rainer.keller@theqtcompany.com>2015-04-22 15:31:34 +0300
commit31c8985d9f1f48d177a68514890da2dce581e658 (patch)
tree77420640468296428e7cecdaf1e9b32b7869def5
parent1f4b424073ed89263ca69b782617b70207cbd7e2 (diff)
b2qt-flashing-wizard: Files are now located at a different location
Change-Id: I13ad2ed897a8d03159830aa94ea36680e12bd0f9 Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
-rw-r--r--src/b2qt-flashing-wizard/platform_page.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/b2qt-flashing-wizard/platform_page.cpp b/src/b2qt-flashing-wizard/platform_page.cpp
index a70178d..28df88b 100644
--- a/src/b2qt-flashing-wizard/platform_page.cpp
+++ b/src/b2qt-flashing-wizard/platform_page.cpp
@@ -127,10 +127,16 @@ void PlatformPage::initializePage()
QDir dir(G_SDKDIR);
foreach (const QString i, dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
- if (!i.startsWith("Boot2Qt-"))
- continue;
-
QDir dir2(dir.absoluteFilePath(i));
+
+ if (i.startsWith("Boot2Qt-")) {
+ // nothing
+ } else if (dir2.exists("Boot2Qt")) {
+ dir2 = dir2.absoluteFilePath("Boot2Qt");
+ } else {
+ continue;
+ }
+
foreach (const QString j, dir2.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) {
if (j.startsWith("emulator-"))
continue;