Merge branch 'master' of github.com:openscad/openscad

2014-02-27 00:14:33 -05:00 · 2014-02-27 00:14:33 -05:00 · fb49c77f25
parent ec40bae6e9 bc86c4936d
commit fb49c77f25
2 changed files with 5 additions and 1 deletions
--- a/openscad.pro
+++ b/openscad.pro
@ -90,6 +90,7 @@ else {

 win* {
  RC_FILE = openscad_win32.rc
+  QTPLUGIN += qtaccessiblewidgets
 }

 CONFIG += qt
--- a/src/openscad.cc
+++ b/src/openscad.cc
@ -446,8 +446,11 @@ int cmdline(const char *deps_output_file, const std::string &filename, Camera &c
 #define OPENSCAD_QTGUI 1
 #endif

-
 #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"