diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:39:15 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:39:15 +0100 |
| commit | e918605f4238841596a1723a0a8592ec152dc723 (patch) | |
| tree | 1c00298abfd5dbb47cb4125b22f37f14fcdbe4d8 /mkspecs | |
| parent | 1a1a0e31590a5a7f360a86de5c34a2aec8e17157 (diff) | |
| parent | 15df60239d2dd3b0f0844e3ec8c91300fb7a4b67 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/corelib/json/qjsonparser.cpp
src/gui/opengl/qopengl.cpp
Change-Id: Ib4d3208398399691839e6c6eaeb9006f99e3a62b
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/lex.prf | 1 | ||||
| -rw-r--r-- | mkspecs/features/yacc.prf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/lex.prf b/mkspecs/features/lex.prf index 16d3a6aa94..7d8325bedb 100644 --- a/mkspecs/features/lex.prf +++ b/mkspecs/features/lex.prf @@ -5,6 +5,7 @@ { lex.name = Lex ${QMAKE_FILE_IN} lex.input = LEXSOURCES + lex.dependency_type = TYPE_C lex_included { lex.CONFIG += no_link } else { diff --git a/mkspecs/features/yacc.prf b/mkspecs/features/yacc.prf index 915fbf6850..618f0668c2 100644 --- a/mkspecs/features/yacc.prf +++ b/mkspecs/features/yacc.prf @@ -35,6 +35,7 @@ yacc_impl.name = source for ${QMAKE_FILE_IN} yacc_impl.input = YACCSOURCES yacc_impl.variable_out = GENERATED_SOURCES + yacc_impl.dependency_type = TYPE_C yacc_impl.commands = $$escape_expand(\\n) # We don't want any commands where, but if command is empty no rules are created yacc_impl.depends += $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_MOD_YACC}$${first(QMAKE_EXT_H)} # Make sure we depend on the step above yacc_impl.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_MOD_YACC}$${first(QMAKE_EXT_CPP)} # Faked output from this step, output really created in step above |