diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-25 13:44:34 +0200 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-25 13:45:18 +0200 |
| commit | 62fe9e0b36ac3caed1ec38132be3ef43fe094366 (patch) | |
| tree | e9e68b79183ea2965189cf76fcfe4cb512884741 /basicsuite/shared/shared.pri | |
| parent | 0325d7b4156098ef064f04208905712c5bf0174e (diff) | |
| parent | 80c1335ec02c038329603486315d06d7bddc1326 (diff) | |
Merge branch 'release' into stable
* release:
Fix typo Main -> SharedMain
Fix stand alone demo layout issues on portrait devices
Exclude mediaplayer also from eLinux-bone, since not working
Change-Id: I25ec98b4c3380155230a5381b4146e71da124de5
Diffstat (limited to 'basicsuite/shared/shared.pri')
| -rw-r--r-- | basicsuite/shared/shared.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/basicsuite/shared/shared.pri b/basicsuite/shared/shared.pri index dbfd513..8f66b7d 100644 --- a/basicsuite/shared/shared.pri +++ b/basicsuite/shared/shared.pri @@ -12,7 +12,8 @@ HEADERS += $$PWD/engine.h defineTest(b2qtdemo_deploy_defaults) { commonFiles.files = \ exclude.txt \ - ../shared/loader.qml + ../shared/SharedMain.qml \ + ../shared/main_landscape.qml commonFiles.path = $$DESTPATH OTHER_FILES += $${commonFiles.files} INSTALLS += commonFiles |