Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-02-28 21:03:16 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-02-28 21:03:16 (GMT) |
| commit | 85b7d1be42206e083956ad98e1ee65d3d22adb8b (patch) | |
| tree | efc03fe9a4452987f55206e105d527a3ef828cce | |
| parent | e34b371ea67afa800ffa71d9d8039db83018957f (diff) | |
| download | swift-contrib-85b7d1be42206e083956ad98e1ee65d3d22adb8b.zip swift-contrib-85b7d1be42206e083956ad98e1ee65d3d22adb8b.tar.bz2 | |
Add workaround for Qt MOC bug.
Details about the workaround & bug can be found here:
https://bugreports.qt-project.org/browse/QTBUG-22829
Resolves: #1067
| -rw-r--r-- | BuildTools/SCons/Tools/qt4.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/BuildTools/SCons/Tools/qt4.py b/BuildTools/SCons/Tools/qt4.py index 2c40454..d9e41d8 100644 --- a/BuildTools/SCons/Tools/qt4.py +++ b/BuildTools/SCons/Tools/qt4.py @@ -286,9 +286,12 @@ def generate(env): # Commands for the qt support ... QT4_UICCOM = '$QT4_UIC $QT4_UICFLAGS -o $TARGET $SOURCE', - QT4_MOCFROMHCOM = '$QT4_MOC $QT4_MOCFROMHFLAGS $QT4_MOCINCFLAGS -o $TARGET $SOURCE', + # FIXME: The -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED flag is a hack to work + # around an issue in Qt + # See https://bugreports.qt-project.org/browse/QTBUG-22829 + QT4_MOCFROMHCOM = '$QT4_MOC -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED $QT4_MOCFROMHFLAGS $QT4_MOCINCFLAGS -o $TARGET $SOURCE', QT4_MOCFROMCXXCOM = [ - '$QT4_MOC $QT4_MOCFROMCXXFLAGS $QT4_MOCINCFLAGS -o $TARGET $SOURCE', + '$QT4_MOC -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED $QT4_MOCFROMCXXFLAGS $QT4_MOCINCFLAGS -o $TARGET $SOURCE', Action(checkMocIncluded,None)], QT4_LUPDATECOM = '$QT4_LUPDATE $SOURCE -ts $TARGET', QT4_LRELEASECOM = '$QT4_LRELEASE -silent $SOURCE -qm $TARGET', |