try fixing win build error via moc hack

8 years ago · b4776abddb
3 changed files with 4 additions and 3 deletions
--- a/.qmake.conf
+++ b/.qmake.conf
@ -2,7 +2,6 @@ load(qt_build_config)

 CONFIG += warning_clean exceptions c++14
 win32:cross_compile: CONFIG += winrt
-win32-g++: CONFIG += mingw  # TODO qpmx fix until fixed upstream
 DEFINES += QT_DEPRECATED_WARNINGS QT_ASCII_CAST_WARNINGS

 MODULE_VERSION = 1.0.0
--- a/src/mvvmcore/binding.h
+++ b/src/mvvmcore/binding.h
@ -7,6 +7,10 @@

 #include "QtMvvmCore/qtmvvmcore_global.h"

+#if defined(QT_BUILD_MVVMCORE_LIB) && defined(Q_MOC_RUN)
+#include "binding_p.h"
+#endif
+
 namespace QtMvvm {

 class BindingPrivate;
--- a/src/mvvmcore/mvvmcore.pro
+++ b/src/mvvmcore/mvvmcore.pro
@ -48,5 +48,3 @@ else: include($$OUT_PWD/qpmx_generated.pri)

 qpmx_ts_target.files -= $$OUT_PWD/$$QPMX_WORKINGDIR/qtmvvmcore_template.qm
 qpmx_ts_target.files += translations/qtmvvmcore_template.ts
-
-message(CONFIG = $$CONFIG) # TODO debug remove