From 36e0d73e699d0cc1f3ba90a5ed3ab68662588167 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Tue, 25 Feb 2014 20:20:14 -0600
Subject: [PATCH 1/4] enable qtaccessibility plugin so that screenreading of
 QAction menu works (tested on Jaws screenreader demo on Windows 7, per bug
 report to mailing list by Robert Jaquiss 2/25/2014)

---
 openscad.pro    | 2 ++
 src/openscad.cc | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/openscad.pro b/openscad.pro
index d59dbeb1..3d3857cc 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -41,6 +41,8 @@ TEMPLATE = app
 INCLUDEPATH += src
 DEPENDPATH += src
 
+QTPLUGIN += qtaccessiblewidgets
+
 # Handle custom library location.
 # Used when manually installing 3rd party libraries
 OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
diff --git a/src/openscad.cc b/src/openscad.cc
index 7971512f..93eedb8d 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -70,6 +70,9 @@
 #include <boost/foreach.hpp>
 #include "boosty.h"
 
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qtaccessiblewidgets)
+
 #ifdef _MSC_VER
 #define snprintf _snprintf
 #endif

From ced162977f031785240eed55a9760802d9447e60 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Wed, 26 Feb 2014 18:07:30 -0600
Subject: [PATCH 2/4] fix broken test build

---
 src/MainWindow.ui | 13 +++++++++++++
 src/openscad.cc   |  6 ++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index f5d4b768..2e15c3e7 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -335,6 +335,8 @@
     <addaction name="separator"/>
     <addaction name="editActionHide"/>
     <addaction name="viewActionHide"/>
+    <addaction name="viewActionFocusEditor"/>
+    <addaction name="viewActionFocusConsole"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
@@ -510,6 +512,17 @@
     <string>Hide editor</string>
    </property>
   </action>
+  <action name="viewActionFocusEditor">
+   <property name="text">
+    <string>Switch focus to editor</string>
+   </property>
+  </action>
+  <action name="viewActionFocusConsole">
+   <property name="text">
+    <string>Switch focus to console</string>
+   </property>
+  </action>
+
   <action name="designActionReloadAndCompile">
    <property name="text">
     <string>&amp;Reload and Compile</string>
diff --git a/src/openscad.cc b/src/openscad.cc
index 93eedb8d..fa63aced 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -70,9 +70,6 @@
 #include <boost/foreach.hpp>
 #include "boosty.h"
 
-#include <QtPlugin>
-Q_IMPORT_PLUGIN(qtaccessiblewidgets)
-
 #ifdef _MSC_VER
 #define snprintf _snprintf
 #endif
@@ -449,8 +446,9 @@ int cmdline(const char *deps_output_file, const std::string &filename, Camera &c
 #define OPENSCAD_QTGUI 1
 #endif
 
-
 #ifdef OPENSCAD_QTGUI
+#include <QtPlugin>
+Q_IMPORT_PLUGIN(qtaccessiblewidgets)
 #include "MainWindow.h"
   #ifdef __APPLE__
   #include "EventFilter.h"

From afcf7239ab204c2a4d15be09ef0c69fff6d67e43 Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Wed, 26 Feb 2014 18:29:57 -0600
Subject: [PATCH 3/4] fix broken linux gui build!!

---
 openscad.pro    | 3 +--
 src/openscad.cc | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/openscad.pro b/openscad.pro
index 3d3857cc..0da75f41 100644
--- a/openscad.pro
+++ b/openscad.pro
@@ -41,8 +41,6 @@ TEMPLATE = app
 INCLUDEPATH += src
 DEPENDPATH += src
 
-QTPLUGIN += qtaccessiblewidgets
-
 # Handle custom library location.
 # Used when manually installing 3rd party libraries
 OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES)
@@ -92,6 +90,7 @@ else {
 
 win* {
   RC_FILE = openscad_win32.rc
+  QTPLUGIN += qtaccessiblewidgets
 }
 
 CONFIG += qt
diff --git a/src/openscad.cc b/src/openscad.cc
index fa63aced..f141b933 100644
--- a/src/openscad.cc
+++ b/src/openscad.cc
@@ -448,7 +448,9 @@ int cmdline(const char *deps_output_file, const std::string &filename, Camera &c
 
 #ifdef OPENSCAD_QTGUI
 #include <QtPlugin>
+#if defined(__MINGW64__) || defined(__MINGW32__) || defined(_MSCVER)
 Q_IMPORT_PLUGIN(qtaccessiblewidgets)
+#endif
 #include "MainWindow.h"
   #ifdef __APPLE__
   #include "EventFilter.h"

From 14771c90befe414a2726d09ab1dd8ac5bd7d500f Mon Sep 17 00:00:00 2001
From: Don Bright <hugh.m.bright@gmail.com>
Date: Wed, 26 Feb 2014 18:40:32 -0600
Subject: [PATCH 4/4] remove experimental menu options

---
 src/MainWindow.ui | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 2e15c3e7..f5d4b768 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -335,8 +335,6 @@
     <addaction name="separator"/>
     <addaction name="editActionHide"/>
     <addaction name="viewActionHide"/>
-    <addaction name="viewActionFocusEditor"/>
-    <addaction name="viewActionFocusConsole"/>
    </widget>
    <widget class="QMenu" name="menuHelp">
     <property name="title">
@@ -512,17 +510,6 @@
     <string>Hide editor</string>
    </property>
   </action>
-  <action name="viewActionFocusEditor">
-   <property name="text">
-    <string>Switch focus to editor</string>
-   </property>
-  </action>
-  <action name="viewActionFocusConsole">
-   <property name="text">
-    <string>Switch focus to console</string>
-   </property>
-  </action>
-
   <action name="designActionReloadAndCompile">
    <property name="text">
     <string>&amp;Reload and Compile</string>