diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-06 14:31:07 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-12-11 16:13:36 +0100 |
| commit | 905cab6b907fecc7ac9fff561ba5c99ab51621e2 (patch) | |
| tree | 938c3f65d0168c46ad79a882fc7a51bcd202ef0b /Tools | |
| parent | e286166f8c7dd4a9cdc071d5ed7a2e84eb73e7b1 (diff) | |
| download | qtwebkit-905cab6b907fecc7ac9fff561ba5c99ab51621e2.tar.gz | |
change setup of QMAKE_MOC
don't load(moc) explicitly - turns out that this breaks
debug_and_release builds (the feature does not like being loaded before
default_post has been loaded).
so instead just do a minimal call to find the moc executable.
as it's in fact only two files which need it, so de-centralize this call
for the sake of saving some cpu cycles spent in qmake.
Change-Id: Ia0038f893c3931571e1494894bedcae85ebb4c8e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri b/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri index c8e4f5b81..54e4d34b8 100644 --- a/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri +++ b/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri @@ -21,6 +21,8 @@ IDL_BINDINGS += \ Bindings/TestRunner.idl \ Bindings/TextInputController.idl \ +qtPrepareTool(QMAKE_MOC, moc) + # GENERATOR 1: IDL compiler idl.output = JS${QMAKE_FILE_BASE}.cpp idl.input = IDL_BINDINGS diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 39eec9bb5..d64956739 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -11,10 +11,6 @@ eval($$env_cache) load(functions) -# Derived sources often need QMAKE_MOC -load(qt_functions) -load(moc) - # FIXME: In this case we probably want to exit early so that we # don't load all of the custom build tweaks needlessly. pro_file = $$_PRO_FILE_ # Checking the variable directly does not work |