From 06ae2e3589752e1ad915759ac68841f92c2aa2c5 Mon Sep 17 00:00:00 2001
From: Thierry Bastian <thierry.bastian@nokia.com>
Date: Wed, 18 Nov 2009 11:28:59 +0100
Subject: Compilation fix for VC and file dialog

---
 src/gui/dialogs/qfiledialog_win_p.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gui/dialogs/qfiledialog_win_p.h b/src/gui/dialogs/qfiledialog_win_p.h
index 68e6a13..6d8c7c9 100644
--- a/src/gui/dialogs/qfiledialog_win_p.h
+++ b/src/gui/dialogs/qfiledialog_win_p.h
@@ -39,10 +39,9 @@
 **
 ****************************************************************************/
 
-#ifndef QFILEDIAG_WIN_P_H
-
 #include <shlobj.h>
 #include <objbase.h>
+#if !defined(QFILEDIAG_WIN_P_H) && !defined(__shobjidl_h__)
 
 //these are the interface declarations needed for the file dialog on Vista and up
 
-- 
cgit v0.12