diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-27 13:59:41 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-27 13:59:41 (GMT) |
| commit | 016a45cd8cba7f45e203a2a8f834cf7041a6f1a4 (patch) | |
| tree | 4ca747ec0fb3985866a04ec17b7edc4338b03d25 /examples | |
| parent | 8f9fc02a191667a710d6a995ace97a96741d2fbc (diff) | |
| parent | 4199c4440ce85acde81dd19a5a3a5903f78cac3a (diff) | |
| download | Qt-016a45cd8cba7f45e203a2a8f834cf7041a6f1a4.zip Qt-016a45cd8cba7f45e203a2a8f834cf7041a6f1a4.tar.gz Qt-016a45cd8cba7f45e203a2a8f834cf7041a6f1a4.tar.bz2 | |
Merge branch '4.8'
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/maemovibration/maemovibration.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/widgets.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/maemovibration/maemovibration.pro b/examples/widgets/maemovibration/maemovibration.pro index 5c645dd..e4107c6 100644 --- a/examples/widgets/maemovibration/maemovibration.pro +++ b/examples/widgets/maemovibration/maemovibration.pro @@ -47,6 +47,6 @@ maemo5 { } !maemo5 { - error(The Maemo Vibration Example only works for the maemo target!) + warning(The Maemo Vibration Example only works for the maemo target!) } diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 4e663ae..f957305 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -36,7 +36,7 @@ symbian: SUBDIRS = \ wiggly \ softkeys -MAEMO5: SUBDIRS += maemovibration +maemo5: SUBDIRS += maemovibration contains(styles, motif): SUBDIRS += styles |