diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-25 17:02:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-13 18:42:38 +0100 |
| commit | 2ed081a88bce69a40dacf4c32fa0b3565da97f16 (patch) | |
| tree | e64233a6c5737083a4aefbf18fc095673728bb2f /src | |
| parent | 566d28316dd73bfe4a8ea34839989ee9df7e3895 (diff) | |
fix & simplify quoting
$$quote() doesn't do what you think, unless you did RTFM.
and it's usually just as unnecessary as double quotes,
depending on context.
Change-Id: Iaeadaa75b0650aad383a6e6031b822c04b537fb1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/angle/src/common/common.pri | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/angle/src/common/common.pri b/src/angle/src/common/common.pri index 8806c03c95..c7d2a2d5ae 100644 --- a/src/angle/src/common/common.pri +++ b/src/angle/src/common/common.pri @@ -15,17 +15,17 @@ win32-msvc2012 { error("Cannot determine DirectX SDK location. Please set DXSDK_DIR environment variable.") } - DXINC_DIR = $$quote($${DX_DIR}Include) + DXINC_DIR = $${DX_DIR}Include contains(QT_ARCH, x86_64) { - DXLIB_DIR = $$quote($${DX_DIR}Lib\\x64) + DXLIB_DIR = $${DX_DIR}Lib\\x64 } else { - DXLIB_DIR = $$quote($${DX_DIR}Lib\\x86) + DXLIB_DIR = $${DX_DIR}Lib\\x86 } equals(QMAKE_TARGET.arch, x86_64) { - FXC = "\"$${DX_DIR}Utilities\\bin\\x64\\fxc.exe\"" + FXC = \"$${DX_DIR}Utilities\\bin\\x64\\fxc.exe\" } else { - FXC = "\"$${DX_DIR}Utilities\\bin\\x86\\fxc.exe\"" + FXC = \"$${DX_DIR}Utilities\\bin\\x86\\fxc.exe\" } msvc { @@ -36,7 +36,7 @@ win32-msvc2012 { # Similarly we want the MinGW linker to use the import libraries shipped with the compiler # instead of those from the SDK which cause a crash on startup. - LIBS += -L$$DXLIB_DIR + LIBS += -L\"$$DXLIB_DIR\" } } |