From b4776abddb93924702da6876ed4af259a927b519 Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Sun, 11 Feb 2018 19:02:18 +0100 Subject: [PATCH] try fixing win build error via moc hack --- .qmake.conf | 1 - src/mvvmcore/binding.h | 4 ++++ src/mvvmcore/mvvmcore.pro | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.qmake.conf b/.qmake.conf index 81d83ff..8780c87 100644 --- 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 diff --git a/src/mvvmcore/binding.h b/src/mvvmcore/binding.h index 2d3d3d1..865cef9 100644 --- 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; diff --git a/src/mvvmcore/mvvmcore.pro b/src/mvvmcore/mvvmcore.pro index ff1d9bb..2176f33 100644 --- 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