diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:57 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:58:57 +0200 |
| commit | 2701763c003e9d2cc59a936491ab2fa8b6ff7f74 (patch) | |
| tree | 0f4782ba43d8fa5a45e629ff20bf75542dd95deb /examples/sensors/grue/import/import.pro | |
| parent | 12ac3b3b4645bf781b31ea713c111a73239c4885 (diff) | |
| parent | 87b569ccc4df161e33d41f7a5f1f25eced6f65c3 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Ia804a9a975baea0f971c7bea004c5ce403d1adee
Diffstat (limited to 'examples/sensors/grue/import/import.pro')
| -rw-r--r-- | examples/sensors/grue/import/import.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/sensors/grue/import/import.pro b/examples/sensors/grue/import/import.pro index 87e3c91b..08b312db 100644 --- a/examples/sensors/grue/import/import.pro +++ b/examples/sensors/grue/import/import.pro @@ -31,7 +31,7 @@ copyfile = $$PWD/qmldir copydest = $$DESTDIR # On Windows, use backslashes as directory separators -win32: { +equals(QMAKE_HOST.os, Windows) { copyfile ~= s,/,\\,g copydest ~= s,/,\\,g } |