AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix & simplify quoting

Browse Source 
$$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>
This commit is contained in:
Oswald Buddenhagen 2013-01-25 17:02:44 +01:00 committed by The Qt Project
parent 566d28316d
commit 2ed081a88b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/angle/src/common/common.pri
View File

@ -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\"
}
}