summaryrefslogtreecommitdiffstats
path: root/config.profiles
diff options
context:
space:
mode:
authorEckhart Koppen <eckhart.koppen@nokia.com>2011-01-05 08:55:04 (GMT)
committerEckhart Koppen <eckhart.koppen@nokia.com>2011-01-05 08:55:04 (GMT)
commit077f0cc4ebcacd130a4710a4d510ace18b383fb0 (patch)
treea288fbd8e99ac5ce4a2fc975c0e8ef5e4a9d5eb8 /config.profiles
parentca87617ed4ba05a2ee1428616d1758ac6a05a26f (diff)
downloadQt-077f0cc4ebcacd130a4710a4d510ace18b383fb0.zip
Qt-077f0cc4ebcacd130a4710a4d510ace18b383fb0.tar.gz
Qt-077f0cc4ebcacd130a4710a4d510ace18b383fb0.tar.bz2
Added patch for temporary support for --listgen option in qmake
The --listgen option is needed in qmake for Symbian platform builds to list the files generated by qmake. This patch enables qmake to recognize this option, but is not functional, just to allow builds to succeed. This patch is not applied to qmake directly, but only made available in the source tree for usage in the build setup. Reviewed-by: TrustMe
Diffstat (limited to 'config.profiles')
-rw-r--r--config.profiles/symbian/patches/qmake_listgen.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/config.profiles/symbian/patches/qmake_listgen.patch b/config.profiles/symbian/patches/qmake_listgen.patch
new file mode 100644
index 0000000..b6224ce
--- /dev/null
+++ b/config.profiles/symbian/patches/qmake_listgen.patch
@@ -0,0 +1,47 @@
+commit b2d4d498faa3c532372838ffa287906fdafdc3c6
+Author: Eckhart Koppen <eckhart.koppen@nokia.com>
+Date: Fri Nov 19 17:31:36 2010 +0200
+
+ Added -listgen option (not functional!) temporarily
+
+diff --git a/qmake/option.cpp b/qmake/option.cpp
+index 27e7c18..1c52d0f 100644
+--- a/qmake/option.cpp
++++ b/qmake/option.cpp
+@@ -112,6 +112,7 @@ QString Option::mkfile::qmakespec;
+ int Option::mkfile::cachefile_depth = -1;
+ bool Option::mkfile::do_deps = true;
+ bool Option::mkfile::do_mocs = true;
++bool Option::mkfile::listgen = false;
+ bool Option::mkfile::do_dep_heuristics = true;
+ bool Option::mkfile::do_preprocess = false;
+ bool Option::mkfile::do_stub_makefile = false;
+@@ -198,6 +199,7 @@ bool usage(const char *a0)
+ " -nocache Don't use a cache file [makefile mode only]\n"
+ " -nodepend Don't generate dependencies [makefile mode only]\n"
+ " -nomoc Don't generate moc targets [makefile mode only]\n"
++ " -listgen Lists generated files [makefile mode only]\n"
+ " -nopwd Don't look for files in pwd [project mode only]\n"
+ ,a0,
+ default_mode(a0) == Option::QMAKE_GENERATE_PROJECT ? " (default)" : "", project_builtin_regx().toLatin1().constData(),
+@@ -297,6 +299,8 @@ Option::parseCommandLine(int argc, char **argv, int skip)
+ Option::mkfile::do_deps = false;
+ } else if(opt == "nomoc") {
+ Option::mkfile::do_mocs = false;
++ } else if(opt == "listgen") {
++ Option::mkfile::listgen = true;
+ } else if(opt == "nocache") {
+ Option::mkfile::do_cache = false;
+ } else if(opt == "createstub") {
+diff --git a/qmake/option.h b/qmake/option.h
+index b09ead2..a46d7fb 100644
+--- a/qmake/option.h
++++ b/qmake/option.h
+@@ -179,6 +179,7 @@ struct Option
+ static bool do_cache;
+ static bool do_deps;
+ static bool do_mocs;
++ static bool listgen;
+ static bool do_dep_heuristics;
+ static bool do_preprocess;
+ static bool do_stub_makefile;