diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-22 11:11:23 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-24 17:19:06 +0000 |
| commit | 0f2f535b9fea74c6269d5f26a51adb07db79e05b (patch) | |
| tree | 5c3fca2b0f592d000d21232b75b4e57ccd81f765 /tools/qmake/mkspecs/features | |
| parent | 73a8da982b5cdeee72f8ef59f4756cafdd2032ef (diff) | |
Do not use moc_predefs.h
We do not currently have a gyp action to generate the file, but
fortunately we can tell moc it doesn't exist so we get the
defines the old way.
Change-Id: I001663d6638cb26a9d0d0307d8bfa4f3bf0ac59d
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'tools/qmake/mkspecs/features')
| -rw-r--r-- | tools/qmake/mkspecs/features/gyp_generator.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qmake/mkspecs/features/gyp_generator.prf b/tools/qmake/mkspecs/features/gyp_generator.prf index 4cf7cd2f4..2fbd74730 100644 --- a/tools/qmake/mkspecs/features/gyp_generator.prf +++ b/tools/qmake/mkspecs/features/gyp_generator.prf @@ -14,6 +14,8 @@ defineReplace(mocAction) { OUTPUT_NAME = $$mocOutput($$INPUT_FILE) DEFINES_LIST = $$join(DEFINES, " -D", -D) INCPATH = $$join(INCLUDEPATH, " -I", -I) + # we don't generate a moc_predef file yet. + MOC_PREDEF_FILE = MOC_COMMAND = $$clean_path($$mocCmdBase()) MOC_COMMAND = $$replace(MOC_COMMAND, $$re_escape("$(DEFINES)"), $$DEFINES_LIST) MOC_COMMAND = $$replace(MOC_COMMAND, $$re_escape("$(INCPATH)"), $$INCPATH) |