diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:20:59 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:20:59 +0100 |
| commit | 422099e8ddeddc0631db3a369e3c52f0ffe2f455 (patch) | |
| tree | a38d0a77e8082c52072e9054b4399090405fcf31 /tests/auto/unit/unit.pro | |
| parent | 16aadf964dcdb71733414afdc7a548ca1ac58f97 (diff) | |
| parent | 88ef2bf83de18542428151553cbfa87de2469c90 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: Id367a610a3aefd288bfe287a3bf64606e582deb9
Diffstat (limited to 'tests/auto/unit/unit.pro')
| -rw-r--r-- | tests/auto/unit/unit.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro index 96dbf0137..37f85209e 100644 --- a/tests/auto/unit/unit.pro +++ b/tests/auto/unit/unit.pro @@ -2,3 +2,4 @@ TEMPLATE = subdirs SUBDIRS += multimedia.pro qtHaveModule(widgets): SUBDIRS += multimediawidgets.pro +qtHaveModule(qml): SUBDIRS += multimediaqml.pro |