rbutil: fix windows cross compile (via M cross environment)

This fixes a couple of issues when cross-compiling for windows:
 - lib builds (i.e. mks5lboot) were overriding the cross CC/CXX with the
   native CC, producing incompatible binaries.
 - Qt made the accessibility plugin part of the core library, so we no
   longer need to import it.

Change-Id: I9d884aee62dfa51d3624a3fa9b99c23b3b375f20

1 files changed, 5 insertions, 2 deletions

diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index cfd6fb39ab..43d74e59d7 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -32,6 +32,7 @@ unix:!mac:!noccache {
 }
 MACHINEFLAGS = $$find(QMAKE_CFLAGS, -m[63][42])
 EXTRALIBS_OPTS += EXTRALIBS_CC=\"$$QMAKE_CC\"
+EXTRALIBS_OPTS += EXTRALIBS_CXX=\"$$QMAKE_CXX\"
 EXTRALIBS_OPTS += EXTRALIB_CFLAGS=\"$$MACHINEFLAGS\" \
 
 MYBUILDDIR = $$OUT_PWD/build/
@@ -251,8 +252,10 @@ macx {
 }
 
 static {
-    QTPLUGIN += qtaccessiblewidgets
-    LIBS += -L$$(QT_BUILD_TREE)/plugins/accessible -lqtaccessiblewidgets
+    if(equals(QT_MAJOR_VERSION, 5) : lessThan(QT_MINOR_VERSION, 4)) | lessThan(QT_MAJOR_VERSION, 5) {
+            QTPLUGIN += qtaccessiblewidgets
+            LIBS += -L$$(QT_BUILD_TREE)/plugins/accessible -lqtaccessiblewidgets
+    }
     LIBS += -L.
     DEFINES += STATIC
     message("using static plugin")