diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:31 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:05:31 +0100 |
| commit | e434118f8954bab277df3cffd367f019fb5a2ab8 (patch) | |
| tree | f3bfa08042158c8ba29ca7b8537af0a566b6d01c | |
| parent | fd3e100b9d3c75181454593e57508039d4ecdab5 (diff) | |
| parent | 3b2175c6a4311a25e12365422bec4d5d35ee996a (diff) | |
| download | qtsensors-e434118f8954bab277df3cffd367f019fb5a2ab8.tar.gz qtsensors-e434118f8954bab277df3cffd367f019fb5a2ab8.tar.bz2 qtsensors-e434118f8954bab277df3cffd367f019fb5a2ab8.zip | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I849cef727ec7cc88f9dccf5c600cbd59de982e7c
| -rw-r--r-- | examples/sensors/grue/qml.pro | 3 | ||||
| -rw-r--r-- | examples/sensors/sensor_explorer/qml.pro | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/examples/sensors/grue/qml.pro b/examples/sensors/grue/qml.pro index 47e21fd..191098e 100644 --- a/examples/sensors/grue/qml.pro +++ b/examples/sensors/grue/qml.pro @@ -2,6 +2,9 @@ TEMPLATE = app TARGET = grue_app QT += quick +# Avoid going to release/debug subdirectory +win32: DESTDIR = ./ + SOURCES = main.cpp RESOURCES += \ diff --git a/examples/sensors/sensor_explorer/qml.pro b/examples/sensors/sensor_explorer/qml.pro index e018830..e2324a8 100644 --- a/examples/sensors/sensor_explorer/qml.pro +++ b/examples/sensors/sensor_explorer/qml.pro @@ -5,6 +5,10 @@ QT += qml quick qtHaveModule(widgets) { QT += widgets } + +# Avoid going to release/debug subdirectory +win32: DESTDIR = ./ + SOURCES = main.cpp app.files = \ |