From 0f2f535b9fea74c6269d5f26a51adb07db79e05b Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 22 Aug 2016 11:11:23 +0200 Subject: Do not use moc_predefs.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- tools/qmake/mkspecs/features/gyp_generator.prf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools/qmake/mkspecs/features/gyp_generator.prf') 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) -- cgit v1.2.3