Fix Unix build issues and work-around Qt5 Mac UI bugs

3 files changed, 65 insertions, 2 deletions

diff --git a/heimdall-frontend/CMakeLists.txt b/heimdall-frontend/CMakeLists.txt
index 76dac2e..95889b3 100644
--- a/heimdall-frontend/CMakeLists.txt
+++ b/heimdall-frontend/CMakeLists.txt
@@ -12,7 +12,10 @@ find_package(Qt5Widgets REQUIRED)
 find_package(ZLIB REQUIRED)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
-set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
+
+if(MINGW)
+    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
+endif(MINGW)
 
 include_directories(${LIBPIT_INCLUDE_DIRS})
 
@@ -33,6 +36,7 @@ qt5_add_resources(HEIMDALL_FRONTEND_RESOURCES
     mainwindow.qrc)
 
 add_executable(heimdall-frontend WIN32
+    MACOSX_BUNDLE
     ${HEIMDALL_FRONTEND_SOURCE_FILES}
     ${HEIMDALL_FRONTEND_FORMS}
     ${HEIMDALL_FRONTEND_RESOURCES})
diff --git a/heimdall-frontend/mainwindow.ui b/heimdall-frontend/mainwindow.ui
index f3113f2..91df00f 100644
--- a/heimdall-frontend/mainwindow.ui
+++ b/heimdall-frontend/mainwindow.ui
@@ -196,6 +196,9 @@
         <height>31</height>

        </rect>

       </property>

+      <property name="focusPolicy">

+       <enum>Qt::NoFocus</enum>

+      </property>

       <property name="text">

        <string>Load / Customise</string>

       </property>

@@ -269,6 +272,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="text">

         <string>Browse</string>

        </property>

@@ -343,6 +349,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="text">

         <string>Donate</string>

        </property>

@@ -359,6 +368,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="text">

         <string>Homepage</string>

        </property>

@@ -510,9 +522,21 @@
           <height>23</height>

          </rect>

         </property>

+        <property name="focusPolicy">

+         <enum>Qt::NoFocus</enum>

+        </property>

         <property name="text">

          <string>Browse</string>

         </property>

+        <property name="autoDefault">

+         <bool>false</bool>

+        </property>

+        <property name="default">

+         <bool>false</bool>

+        </property>

+        <property name="flat">

+         <bool>false</bool>

+        </property>

        </widget>

        <widget class="QLabel" name="pitBrowseTipLabel">

         <property name="enabled">

@@ -935,6 +959,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="text">

         <string>Remove Device</string>

        </property>

@@ -1105,6 +1132,9 @@
           <height>23</height>

          </rect>

         </property>

+        <property name="focusPolicy">

+         <enum>Qt::NoFocus</enum>

+        </property>

         <property name="text">

          <string>Add</string>

         </property>

@@ -1122,6 +1152,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="text">

         <string>Remove</string>

        </property>

@@ -1338,6 +1371,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="text">

         <string>Add Device</string>

        </property>

@@ -1355,6 +1391,9 @@
         <height>31</height>

        </rect>

       </property>

+      <property name="focusPolicy">

+       <enum>Qt::NoFocus</enum>

+      </property>

       <property name="text">

        <string>Build</string>

       </property>

@@ -1416,6 +1455,9 @@
           <height>23</height>

          </rect>

         </property>

+        <property name="focusPolicy">

+         <enum>Qt::NoFocus</enum>

+        </property>

         <property name="text">

          <string>Save As...</string>

         </property>

@@ -1433,6 +1475,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="text">

         <string>Download</string>

        </property>

@@ -1531,6 +1576,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="toolTip">

         <string/>

        </property>

@@ -1625,6 +1673,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="text">

         <string>Print</string>

        </property>

@@ -1750,6 +1801,9 @@
           <height>23</height>

          </rect>

         </property>

+        <property name="focusPolicy">

+         <enum>Qt::NoFocus</enum>

+        </property>

         <property name="text">

          <string>Browse</string>

         </property>

@@ -1777,6 +1831,9 @@
          <height>23</height>

         </rect>

        </property>

+       <property name="focusPolicy">

+        <enum>Qt::NoFocus</enum>

+       </property>

        <property name="text">

         <string>Close</string>

        </property>

@@ -1828,7 +1885,7 @@
      <x>0</x>

      <y>0</y>

      <width>788</width>

-     <height>21</height>

+     <height>22</height>

     </rect>

    </property>

    <widget class="QMenu" name="menuHelp">

diff --git a/heimdall-frontend/source/main.cpp b/heimdall-frontend/source/main.cpp
index c327b63..5d70e28 100644
--- a/heimdall-frontend/source/main.cpp
+++ b/heimdall-frontend/source/main.cpp
@@ -25,7 +25,9 @@
 // Heimdall Frontend

 #include "mainwindow.h"

 

+#if defined(QT_STATIC)

 Q_IMPORT_PLUGIN (QWindowsIntegrationPlugin);

+#endif

 

 using namespace HeimdallFrontend;