From 65b42dd4c8e6aed6ad84dbd4063da3961a779433 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 23 Feb 2012 17:16:03 +0100 Subject: look for mkspecs in the project root, not next to every project qmake would look for mkspecs/ in the directory containing the current project file. this makes completely no sense with recursive projects: a) nobody would make per-project specs and b) specs meant to be global would not be found. consequently, we look for a project root when starting qmake and use only that directory. if .qmake.cache is found/set, we assume that to be the project root. otherwise, we search for mkspecs/ the same way we search for the cache - just to up until we find one or hit the root. if we are shadow-building, search the build dir as well. Change-Id: Ie66b189a40c21203d956e681cbef44a89f98cd17 Reviewed-by: Joerg Bornemann Reviewed-by: Marius Storm-Olsen --- qmake/option.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'qmake/option.h') diff --git a/qmake/option.h b/qmake/option.h index b8a3b561fa..a4d8cccbec 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -108,7 +108,7 @@ struct Option //both of these must be called.. static int init(int argc=0, char **argv=0); //parse cmdline static void applyHostMode(); - static bool prepareProject(); + static bool prepareProject(const QString &pfile); static bool postProcessProject(QMakeProject *); enum StringFixFlags { @@ -202,6 +202,7 @@ struct Option static bool do_dep_heuristics; static bool do_preprocess; static bool do_stub_makefile; + static QString project_root; static QString project_build_root; static QString cachefile; static int cachefile_depth; -- cgit v1.2.3