From d8b2998daeab9bfb7bfb5182960ec09b94885b17 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 9 May 2012 12:47:02 +0200 Subject: Revert "move finding the makespec to Option" Needed for an upcoming revert. This reverts commit 74a6669fa7c0d6e2cb7d34d56332d620d2a07755. Conflicts: qmake/option.cpp qmake/project.cpp qmake/property.cpp Change-Id: I56088506d27bf1f095f9261c75224f4bee17ec60 Reviewed-by: Joerg Bornemann --- qmake/option.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'qmake/option.h') diff --git a/qmake/option.h b/qmake/option.h index 23384877fd..ce680b0d6a 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -109,7 +109,6 @@ struct Option //both of these must be called.. static int init(int argc=0, char **argv=0); //parse cmdline static void applyHostMode(); - static QStringList mkspecPaths(); static bool prepareProject(const QString &pfile); static bool postProcessProject(QMakeProject *); @@ -214,7 +213,6 @@ struct Option private: static int parseCommandLine(int, char **, int=0); - static bool resolveSpec(QString *spec); }; inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); } -- cgit v1.2.3 From 4e9cbfc90f6db09d865d9dc5bb40924fbe0d11a3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 9 May 2012 15:14:37 +0200 Subject: Revert "move .qmake.cache search to Option" We are now moving in the exact opposite direction. This logically reverts commit 059200a44ba7177d0c9ec6bb5e6ee0b7e0c3f017. Some adjustments were necessary to maintain the project root stuff. Conflicts: qmake/main.cpp qmake/option.cpp qmake/option.h qmake/project.cpp Change-Id: Ic14fa571cbbfe9ac159f92493e49741d70a87eff Reviewed-by: Joerg Bornemann --- qmake/option.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'qmake/option.h') diff --git a/qmake/option.h b/qmake/option.h index ce680b0d6a..0ec6a36a29 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -109,7 +109,6 @@ 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(const QString &pfile); static bool postProcessProject(QMakeProject *); enum StringFixFlags { @@ -203,8 +202,6 @@ 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; static QStringList project_files; -- cgit v1.2.3 From 14bbab09c158e3eb54169b42c4a303d396a32f0e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 31 Jan 2012 18:36:18 +0100 Subject: introduce ability to build projects for the host system when qmake runs into the new option(host_build) command, it will restart the project evaluation with a host spec. the new default host spec is called default-host (gasp!). it is overridden with the pre-exising -spec / -platform option, while the new -xspec / -xplatform option overrides the pre-existing default spec. specifying -spec but not -xspec will set the xspec, too, so the behavior is backwards-compatible. same for the XQMAKESPEC override read from .qmake.cache and the environment variable. the cleaner solution would be adding -hostspec, to be symmetrical with the override semantics, but that would deviate from configure in turn. Change-Id: I4297c873780af16ab7928421b434ce0f1d3820da Reviewed-by: Joerg Bornemann --- qmake/option.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qmake/option.h') diff --git a/qmake/option.h b/qmake/option.h index 0ec6a36a29..f6f5dbbb9d 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -196,6 +196,7 @@ struct Option //QMAKE_GENERATE_MAKEFILE options struct mkfile { static QString qmakespec; + static QString xqmakespec; static bool do_cache; static bool do_deps; static bool do_mocs; @@ -206,6 +207,7 @@ struct Option static int cachefile_depth; static QStringList project_files; static QString qmakespec_commandline; + static QString xqmakespec_commandline; }; private: -- cgit v1.2.3 From bf984d5f24741a52a70024f3f43432307281f0ae Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 9 May 2012 15:29:25 +0200 Subject: add $$shadowed() function return the build directory corresponding to a given source directory. this is the identity function if not shadow-building. if input lies outside the source directory, return empty value. Change-Id: I2d2a6b1112bd19989fe29cfe19a12d39a0d208c1 Reviewed-by: Marius Storm-Olsen --- qmake/option.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'qmake/option.h') diff --git a/qmake/option.h b/qmake/option.h index f6f5dbbb9d..c58ef4aed0 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -109,6 +109,7 @@ struct Option //both of these must be called.. static int init(int argc=0, char **argv=0); //parse cmdline static void applyHostMode(); + static void prepareProject(const QString &pfile); static bool postProcessProject(QMakeProject *); enum StringFixFlags { @@ -203,6 +204,8 @@ struct Option static bool do_dep_heuristics; static bool do_preprocess; static bool do_stub_makefile; + static QString source_root; + static QString build_root; static QString cachefile; static int cachefile_depth; static QStringList project_files; -- cgit v1.2.3 From ad92c6c7dea988eeeb6f75c6dfb37645e3086cef Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 12 Mar 2012 17:24:47 +0100 Subject: make splitPathList() return an empty list for an empty string this makes the user code a bit cleaner Change-Id: I3713c73c5c19cf69341be65480917eda0b967b77 Reviewed-by: Joerg Bornemann --- qmake/option.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake/option.h') diff --git a/qmake/option.h b/qmake/option.h index c58ef4aed0..3aa7d6d8c3 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -218,7 +218,7 @@ private: }; inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); } -inline QStringList splitPathList(const QString &paths) { return paths.split(Option::dirlist_sep); } +inline QStringList splitPathList(const QString &paths) { return paths.isEmpty() ? QStringList() : paths.split(Option::dirlist_sep); } QT_END_NAMESPACE -- cgit v1.2.3 From 7d44bd0646dd18cfa67e11fae7d9368d318ed5f6 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 18 Apr 2012 12:09:48 +0200 Subject: remove last traces of js support don't even complain about trying to use js-based feature files. we have been doing that for long enough. Change-Id: Ib58ec204322442c488e8d780989f26b1e32595ed Reviewed-by: Joerg Bornemann --- qmake/option.h | 1 - 1 file changed, 1 deletion(-) (limited to 'qmake/option.h') diff --git a/qmake/option.h b/qmake/option.h index 3aa7d6d8c3..8c273e6772 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -72,7 +72,6 @@ void warn_msg(QMakeWarn t, const char *fmt, ...); struct Option { //simply global convenience - static QString js_ext; static QString libtool_ext; static QString pkgcfg_ext; static QString prf_ext; -- cgit v1.2.3 From a07d4f8fb3c61daf376e85a3e68fe6c6523417d3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 20 Apr 2012 20:10:38 +0200 Subject: remove some symbian cruft - Option::mmp_ext - references to dead QMAKE_INTERNAL_ET_PARSED_* variables Change-Id: I863605b23798cbca3f6c8ab5a154fd432f1f4dcc Reviewed-by: Joerg Bornemann --- qmake/option.h | 1 - 1 file changed, 1 deletion(-) (limited to 'qmake/option.h') diff --git a/qmake/option.h b/qmake/option.h index 8c273e6772..7b86d56e89 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -93,7 +93,6 @@ struct Option static QString dirlist_sep; static QString sysenv_mod; static QString pro_ext; - static QString mmp_ext; static QString res_ext; static char field_sep; static const char *application_argv0; -- cgit v1.2.3