diff options
| author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-18 11:21:41 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2014-11-18 11:22:45 +0200 |
| commit | 79bcab5c2a2be73d20364e7ccd718856659510cc (patch) | |
| tree | d54bde658b37021d254167cc1de96d43c810f9f6 /tests/auto/auto.pro | |
| parent | 4a8a1e06f12a8b9d16696a4c559c325f771cad0c (diff) | |
| parent | 11ed44c13c227c73d9b2ec416aed54b00bda2a0a (diff) | |
Merge branch 'develop'
Change-Id: I6f95e28fa94127ddf2380794323fa5ef0ddfe2c4
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index df2943a4..70ffea39 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS += cpptest +!android: SUBDIRS += cpptest qtHaveModule(quick): SUBDIRS += qmltest |