diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 15:41:47 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-04-10 15:42:22 +0200 |
| commit | 90297a64f203959f90041887ea31f4bd04bc059a (patch) | |
| tree | 86f8ad6a5af26fd618cdb2e20601e6df89ac94d6 /mkspecs/features/create_cmake.prf | |
| parent | 537a4bc4011d32de193dc31caf09a44c1810ab33 (diff) | |
| parent | f273d6fbc02055ff3999adc0df76360ca0670435 (diff) | |
Merge branch 'stable' into dev
Change-Id: Icff019d74ae04c628a80f66aa478e4db40fae464
Diffstat (limited to 'mkspecs/features/create_cmake.prf')
| -rw-r--r-- | mkspecs/features/create_cmake.prf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 9aef37472f..cf0acaf4b7 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -55,10 +55,10 @@ CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) CMAKE_BIN_DIR_IS_ABSOLUTE = True } -CMAKE_ARCHDATA_DIR = $$cmakeRelativePath($$[QT_INSTALL_ARCHDATA], $$[QT_INSTALL_PREFIX]) -!isEmpty(CMAKE_FORCE_ABSOLUTE_PATHS)|contains(CMAKE_ARCHDATA_DIR, "^\\.\\./.*") { # For the mkspecs - CMAKE_ARCHDATA_DIR = $$[QT_INSTALL_ARCHDATA]/ - CMAKE_ARCHDATA_DIR_IS_ABSOLUTE = True +CMAKE_HOST_DATA_DIR = $$cmakeRelativePath($$[QT_HOST_DATA], $$[QT_INSTALL_PREFIX]) +!isEmpty(CMAKE_FORCE_ABSOLUTE_PATHS)|contains(CMAKE_HOST_DATA_DIR, "^\\.\\./.*") { + CMAKE_HOST_DATA_DIR = $$[QT_HOST_DATA]/ + CMAKE_HOST_DATA_DIR_IS_ABSOLUTE = True } static|staticlib:CMAKE_STATIC_TYPE = true |