Merge branch 'master-upstream' into master-water

3 files changed, 72 insertions, 30 deletions

diff --git a/config.profiles/symbian/bld.inf b/config.profiles/symbian/bld.inf
index d3958dd..d2d959b 100644
--- a/config.profiles/symbian/bld.inf
+++ b/config.profiles/symbian/bld.inf
@@ -34,11 +34,13 @@ environment.prf /epoc32/tools/qt/mkspecs/features/environment.prf
 //for loc
 loc.prf                  /epoc32/tools/qt/mkspecs/features/loc.prf
 
+#ifdef FF_QT_IN_UDA
 //For UDA image
 confml/qt.confml                  CONFML_EXPORT_PATH(qt.confml,uda_content)
 implml/qt_copy.implml             CRML_EXPORT_PATH(qt_copy.implml,uda_content)
 content/apps/qt.sisx               CRML_EXPORT_PATH(../content/sis/,uda_content)
 content/apps/qt_stub.sis          /epoc32/data/z/system/install/qt_stub.sis
+#endif
 
 //tools
 ../../bin/createpackage.bat         /epoc32/tools/createpackage.bat
@@ -73,13 +75,6 @@ translations/qt_zh_tw_symbian.ts /epoc32/include/platform/qt/translations/qt_zh_
 ../../translations/qt_sv.ts /epoc32/include/platform/qt/translations/
 ../../translations/qt_uk.ts /epoc32/include/platform/qt/translations/
 
-
-PRJ_MMPFILES
-
-
-PRJ_TESTMMPFILES
-
-
 PRJ_EXTENSIONS
 START EXTENSION qt/qtconfig
 OPTION QT_ROOT ..
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;
diff --git a/config.profiles/symbian/qtconfig.flm b/config.profiles/symbian/qtconfig.flm
index 61ee6e6..03f860f 100644
--- a/config.profiles/symbian/qtconfig.flm
+++ b/config.profiles/symbian/qtconfig.flm
@@ -33,38 +33,38 @@ $(TARGET_TOOLS): $(QT_TOOLS)
 else
 $(TARGET_TOOLS): $(SOURCEDIR)/qmake$(DOTEXE)
 endif
-    $(call startrule,qtconf_deploy) \
-    $(GNUCP) $(SOURCEDIR)/$$(notdir $$@) $$@ \
-    $(call endrule,qtconf_deploy)
+	$(call startrule,qtconf_deploy) \
+	$(GNUCP) $(SOURCEDIR)/$$(notdir $$@) $$@ \
+	$(call endrule,qtconf_deploy)
 
 ifneq ($(filter linux,$(HOSTPLATFORM)),)
 $(QT_TOOLS): $(TOOLSSRCDIR)/bootstrap
-    $(call startrule,qtconf_tools_build) \
-    cd $$@; \
-    $(GNUMAKE38); \
-    cd .. \
-    $(call endrule,qtconf_tools_build)
+	$(call startrule,qtconf_tools_build) \
+	cd $$@; \
+	$(GNUMAKE38); \
+	cd .. \
+	$(call endrule,qtconf_tools_build)
 
 $(TOOLSSRCDIR)/bootstrap:$(SOURCEDIR)/qmake$(DOTEXE)
-    $(call startrule,qtconf_bootstrap_build) \
-    cd $(TOOLSSRCDIR)/bootstrap; \
-    $(GNUMAKE38); \
-    cd .. \
-    $(call endrule,qtconf_bootstrap_build)
+	$(call startrule,qtconf_bootstrap_build) \
+	cd $(TOOLSSRCDIR)/bootstrap; \
+	$(GNUMAKE38); \
+	cd .. \
+	$(call endrule,qtconf_bootstrap_build)
 endif
 
 
 $(SOURCEDIR)/qmake$(DOTEXE): $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP)
-    $(call startrule,qtconf) \
-    cd $(EXTENSION_ROOT)/$(QT_ROOT) && unset INCLUDE && unset LIB && $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) -platform $(PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS) \
-    $(call endrule,qtconf)
-    $(call startrule,headerexport) \
-    cd $(EXTENSION_ROOT)/$(QT_ROOT)/config.profiles/symbian && \
-    perl headerexport -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -copy -oneway -outdir $(EPOCROOT)/epoc32/include/ -outsubdir mw
-    $(call endrule,headerexport)
-    $(call startrule,mkspecexport) \
-    $(GNUCP) -R $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(MKSPECDIR)
-    $(call endrule,mkspecexport)
+	$(call startrule,qtconf) \
+	cd $(EXTENSION_ROOT)/$(QT_ROOT) && unset INCLUDE && unset LIB && $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) -platform $(PLATFORM) -xplatform $(XPLATFORM) $(OPTIONS) \
+	$(call endrule,qtconf)
+	$(call startrule,headerexport) \
+	cd $(EXTENSION_ROOT)/$(QT_ROOT)/config.profiles/symbian && \
+	perl headerexport -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -copy -oneway -outdir $(EPOCROOT)/epoc32/include/ -outsubdir mw
+	$(call endrule,headerexport)
+	$(call startrule,mkspecexport) \
+	$(GNUCP) -R $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(MKSPECDIR)
+	$(call endrule,mkspecexport)
 endef
 
 # Here a variable named "done_<sanitised $SISFILE>" gets created