From 6b9d3314bdc1dc7883bd4c1c3846056acd00eab1 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 20 Nov 2013 13:55:23 +0100 Subject: QML examples: Avoid using release/debug output subdirectory Qt Sensors examples that include additional QML modules fail to run on Windows, because the application located under a debug or release subdirectory does not see the module import path. This change fixes the issue by adjusting examples' DESTDIR on Windows builds. Task-number: QTBUG-33875 Change-Id: Iab8ebc1acd80cf4fe88a7a35b44c42f767da5ccf Reviewed-by: Friedemann Kleint Reviewed-by: Alex Blasche --- examples/sensors/grue/qml.pro | 3 +++ examples/sensors/sensor_explorer/qml.pro | 4 ++++ 2 files changed, 7 insertions(+) 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 = \ -- cgit v1.2.1 From 2d859d940b56ec4f692e5a48083380c69f9b2532 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 25 Nov 2013 12:49:19 +0100 Subject: Bump MODULE_VERSION to 5.2.1 Change-Id: I5082d09607f08c4daad72a8530f7f76feac397fa Reviewed-by: Matti Paaso Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 2f09a2b..45d05b2 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.2.0 +MODULE_VERSION = 5.2.1 -- cgit v1.2.1