projects / platform / upstream / qtmultimedia.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 945e8c9)
fix build for standard DirectX install paths
authorJoerg Bornemann <joerg.bornemann@digia.com>
Wed, 5 Dec 2012 12:05:53 +0000 (13:05 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 6 Dec 2012 10:48:26 +0000 (11:48 +0100)
Evaluate the environment variable DXSDK_DIR at qmake time.
This makes sure, the contents get properly quoted, even if the DirectX
SDK is installed into a path that contains spaces.

Change-Id: Id22f56448eef4d392af77e97f46308f1b486c7c7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
src/plugins/directshow/camera/camera.pri patch | blob | history

diff --git a/src/plugins/directshow/camera/camera.pri b/src/plugins/directshow/camera/camera.pri
index b576a85..91111be 100644 (file)
--- a/src/plugins/directshow/camera/camera.pri
+++ b/src/plugins/directshow/camera/camera.pri
@@ -28,5 +28,5 @@ SOURCES += \
     SOURCES += $$PWD/dsvideowidgetcontrol.cpp
 }
 
-*-msvc*:INCLUDEPATH += $(DXSDK_DIR)/include
+*-msvc*:INCLUDEPATH += $$(DXSDK_DIR)/include
 LIBS += -lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32
Domain: UI Framework / Qt;