From def80ac8dadffa3025c4454d5d50517ba753c2ec Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 13 Jun 2017 13:31:29 +0100
Subject: [PATCH] Only build qt.conf on windows, it breaks linux platform
 plugin search :(

---
 qrenderdoc/Resources/qtconf.qrc             | 5 +++++
 qrenderdoc/Resources/resources.qrc          | 3 ---
 qrenderdoc/qrenderdoc.pro                   | 3 +++
 qrenderdoc/qrenderdoc_local.vcxproj         | 7 +++++++
 qrenderdoc/qrenderdoc_local.vcxproj.filters | 6 ++++++
 5 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 qrenderdoc/Resources/qtconf.qrc

diff --git a/qrenderdoc/Resources/qtconf.qrc b/qrenderdoc/Resources/qtconf.qrc
new file mode 100644
index 000000000..03a1bfc7c
--- /dev/null
+++ b/qrenderdoc/Resources/qtconf.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/qt/etc">
+        <file>qt.conf</file>
+    </qresource>
+</RCC>
diff --git a/qrenderdoc/Resources/resources.qrc b/qrenderdoc/Resources/resources.qrc
index 2d1bcbcd5..4548fa1a7 100644
--- a/qrenderdoc/Resources/resources.qrc
+++ b/qrenderdoc/Resources/resources.qrc
@@ -68,7 +68,4 @@
         <file>action.png</file>
         <file>action_hover.png</file>
     </qresource>
-    <qresource prefix="/qt/etc">
-        <file>qt.conf</file>
-    </qresource>
 </RCC>
diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro
index 6e67c2e21..6851e7f70 100644
--- a/qrenderdoc/qrenderdoc.pro
+++ b/qrenderdoc/qrenderdoc.pro
@@ -61,6 +61,9 @@ win32 {
 	silent:swig.commands = @echo SWIG ${QMAKE_FILE_IN} && $$swig.commands
 	QMAKE_EXTRA_COMPILERS += swig
 
+	# windows only qrc file with qt.conf
+	RESOURCES += Resources/qtconf.qrc
+
 	SWIGSOURCES += Code/pyrenderdoc/renderdoc.i
 	SWIGSOURCES += Code/pyrenderdoc/qrenderdoc.i
 
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj
index aed75432f..0e42bd3ce 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj
+++ b/qrenderdoc/qrenderdoc_local.vcxproj
@@ -638,6 +638,7 @@
     <ClCompile Include="$(IntDir)generated\moc_VirtualFileDialog.cpp" />
     <ClCompile Include="$(IntDir)generated\moc_VulkanPipelineStateViewer.cpp" />
     <ClCompile Include="$(IntDir)generated\qrc_resources.cpp" />
+    <ClCompile Include="$(IntDir)generated\qrc_qtconf.cpp" />
     <ClCompile Include="$(IntDir)generated\renderdoc_python.cxx">
       <DisableSpecificWarnings>4101;4456;4459;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
@@ -1434,6 +1435,12 @@
       <Message>RCC resources.qrc</Message>
       <Outputs>$(IntDir)generated\qrc_resources.cpp</Outputs>
     </CustomBuild>
+    <CustomBuild Include="Resources\qtconf.qrc">
+      <AdditionalInputs>Resources\qtconf.qrc;$(ProjectDir)3rdparty\qt\$(Platform)\bin\uic.exe;%(AdditionalInputs)</AdditionalInputs>
+      <Command>$(ProjectDir)3rdparty\qt\$(Platform)\bin\rcc.exe -name qtconf Resources\qtconf.qrc -o $(IntDir)generated\qrc_qtconf.cpp</Command>
+      <Message>RCC qtconf.qrc</Message>
+      <Outputs>$(IntDir)generated\qrc_qtconf.cpp</Outputs>
+    </CustomBuild>
     <None Include="Resources\runback.png" />
     <None Include="Resources\runcursor.png" />
     <None Include="Resources\runfwd.png" />
diff --git a/qrenderdoc/qrenderdoc_local.vcxproj.filters b/qrenderdoc/qrenderdoc_local.vcxproj.filters
index 1a19e12d3..03e900168 100644
--- a/qrenderdoc/qrenderdoc_local.vcxproj.filters
+++ b/qrenderdoc/qrenderdoc_local.vcxproj.filters
@@ -618,6 +618,9 @@
     <ClCompile Include="Widgets\Extended\RDHeaderView.cpp">
       <Filter>Widgets\Extended</Filter>
     </ClCompile>
+    <ClCompile Include="$(IntDir)generated\qrc_qtconf.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="3rdparty\flowlayout\FlowLayout.h">
@@ -1397,5 +1400,8 @@
     <CustomBuild Include="Widgets\Extended\RDHeaderView.h">
       <Filter>Widgets\Extended</Filter>
     </CustomBuild>
+    <CustomBuild Include="Resources\qtconf.qrc">
+      <Filter>Resources</Filter>
+    </CustomBuild>
   </ItemGroup>
 </Project>
\ No newline at end of file