diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2013-03-21 08:18:12 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-03-21 08:49:01 +0100 |
| commit | 2ab9b747fcc5aa50e8cca758f7780158e734a222 (patch) | |
| tree | 7017007823d54c2d658079e928f7220a1f57a852 /qmake/generators/makefile.h | |
| parent | f1e681bed21e131864fe1e1c91679f7a56b06823 (diff) | |
| parent | 8bfbaa41783dad66976fc83d4ca8c7e2673f5629 (diff) | |
Merge remote-tracking branch 'gerrit/release' into stable
Conflicts:
configure
mkspecs/features/qt_module_headers.prf
mkspecs/features/qt_tool.prf
src/angle/angle.pro
src/tools/bootstrap/bootstrap.pro
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
Diffstat (limited to 'qmake/generators/makefile.h')
| -rw-r--r-- | qmake/generators/makefile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h index e1447c61c3..47acc8098f 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -81,7 +81,7 @@ class MakefileGenerator : protected QMakeSourceFileInfo QString spec; bool init_opath_already, init_already, no_io; QHash<QString, bool> init_compiler_already; - QString chkdir, chkfile, chkglue; + QString makedir, chkexists; QString build_args(const QString &outdir=QString()); //internal caches |