Merge branch 'qdoc-simplified' into mimir-simplified

Conflicts:
	tools/qdoc3/atom.h
	tools/qdoc3/qdoc3.pro

1 files changed, 36 insertions, 48 deletions

diff --git a/mkspecs/features/symbian/sis_targets.prf b/mkspecs/features/symbian/sis_targets.prf
index ad81803..024378b 100644
--- a/mkspecs/features/symbian/sis_targets.prf
+++ b/mkspecs/features/symbian/sis_targets.prf
@@ -33,19 +33,16 @@ equals(GENERATE_SIS_TARGETS, true) {
         
         make_cache_name = .make.cache
         sis_target.target = sis
-        sis_target.commands = $(if $(wildcard $${baseTarget}_template.pkg), \
-                                  $(if $(wildcard $$make_cache_name), \
-                                      $(MAKE) -f $(MAKEFILE) ok_sis MAKEFILES=$$make_cache_name \
+        sis_target.commands = $(if $(wildcard $$make_cache_name), \
+                                  $(MAKE) -f $(MAKEFILE) ok_sis MAKEFILES=$$make_cache_name \
+                              , \
+                                  $(if $(QT_SIS_TARGET), \
+                                      $(MAKE) -f $(MAKEFILE) ok_sis \
                                   , \
-                                      $(if $(QT_SIS_TARGET), \
-                                          $(MAKE) -f $(MAKEFILE) ok_sis \
-                                      , \
-                                          $(MAKE) -f $(MAKEFILE) fail_sis_nocache \
-                                      ) \
+                                      $(MAKE) -f $(MAKEFILE) fail_sis_nocache \
                                   ) \
-                              , \
-                                  $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
                               )
+
         sis_target.depends += $${baseTarget}_template.pkg
 
         ok_sis_target.target = ok_sis
@@ -53,19 +50,16 @@ equals(GENERATE_SIS_TARGETS, true) {
                                      $(QT_SIS_TARGET) $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
 
         unsigned_sis_target.target = unsigned_sis
-        unsigned_sis_target.commands = $(if $(wildcard $${baseTarget}_template.pkg), \
-                                  $(if $(wildcard $$make_cache_name), \
-                                      $(MAKE) -f $(MAKEFILE) ok_unsigned_sis MAKEFILES=$$make_cache_name \
-                                  , \
-                                      $(if $(QT_SIS_TARGET), \
-                                          $(MAKE) -f $(MAKEFILE) ok_unsigned_sis \
+        unsigned_sis_target.commands = $(if $(wildcard $$make_cache_name), \
+                                          $(MAKE) -f $(MAKEFILE) ok_unsigned_sis MAKEFILES=$$make_cache_name \
                                       , \
-                                          $(MAKE) -f $(MAKEFILE) fail_sis_nocache \
-                                      ) \
-                                  ) \
-                              , \
-                                  $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
-                              )
+                                          $(if $(QT_SIS_TARGET), \
+                                              $(MAKE) -f $(MAKEFILE) ok_unsigned_sis \
+                                          , \
+                                              $(MAKE) -f $(MAKEFILE) fail_sis_nocache \
+                                          ) \
+                                      )
+
         unsigned_sis_target.depends += $${baseTarget}_template.pkg
 
         ok_unsigned_sis_target.target = ok_unsigned_sis
@@ -74,49 +68,39 @@ equals(GENERATE_SIS_TARGETS, true) {
         target_sis_target.target = $${baseTarget}.sis
         target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis
 
+        # The installer_sis target has dependency to sis target, so it will regenerate sis package.
+        # To create smart installer wrapper for for an existing sis package, use ok_installer_sis target directly.
         installer_sis_target.target = installer_sis
-        installer_sis_target.commands = $(if $(wildcard $${baseTarget}_installer.pkg), \
-                                            $(MAKE) -f $(MAKEFILE) ok_installer_sis \
-                                        , \
-                                            $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
-                                        )
+        installer_sis_target.commands = $(MAKE) -f $(MAKEFILE) ok_installer_sis
         installer_sis_target.depends = $${baseTarget}_installer.pkg sis
 
         ok_installer_sis_target.target = ok_installer_sis
         ok_installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
                                                $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
+        ok_installer_sis_target.depends = $${baseTarget}_installer.pkg
 
         unsigned_installer_sis_target.target = unsigned_installer_sis
-        unsigned_installer_sis_target.commands = $(if $(wildcard $${baseTarget}_installer.pkg), \
-                                            $(MAKE) -f $(MAKEFILE) ok_unsigned_installer_sis \
-                                        , \
-                                            $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
-                                        )
+        unsigned_installer_sis_target.commands = $(MAKE) -f $(MAKEFILE) ok_unsigned_installer_sis
         unsigned_installer_sis_target.depends = $${baseTarget}_installer.pkg unsigned_sis
 
         ok_unsigned_installer_sis_target.target = ok_unsigned_installer_sis
         ok_unsigned_installer_sis_target.commands = createpackage $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg
-
-        fail_sis_nopkg_target.target = fail_sis_nopkg
-        fail_sis_nopkg_target.commands = "$(error PKG file does not exist, 'sis' and 'installer_sis' target are only supported for executables or projects with DEPLOYMENT statement)"
+        ok_unsigned_installer_sis_target.depends = $${baseTarget}_installer.pkg
 
         fail_sis_nocache_target.target = fail_sis_nocache
         fail_sis_nocache_target.commands = "$(error Project has to be built or QT_SIS_TARGET environment variable has to be set before calling 'SIS' target)"
 
         stub_sis_target.target = stub_sis
-        stub_sis_target.commands = $(if $(wildcard $${baseTarget}_template.pkg), \
-                                       $(if $(wildcard $$make_cache_name), \
-                                           $(MAKE) -f $(MAKEFILE) ok_stub_sis MAKEFILES=$$make_cache_name \
+        stub_sis_target.commands = $(if $(wildcard $$make_cache_name), \
+                                       $(MAKE) -f $(MAKEFILE) ok_stub_sis MAKEFILES=$$make_cache_name \
+                                   , \
+                                       $(if $(QT_SIS_TARGET), \
+                                           $(MAKE) -f $(MAKEFILE) ok_stub_sis \
                                        , \
-                                           $(if $(QT_SIS_TARGET), \
-                                               $(MAKE) -f $(MAKEFILE) ok_stub_sis \
-                                           , \
-                                               $(MAKE) -f $(MAKEFILE) fail_sis_nocache \
-                                           ) \
+                                           $(MAKE) -f $(MAKEFILE) fail_sis_nocache \
                                        ) \
-                                   , \
-                                       $(MAKE) -f $(MAKEFILE) fail_sis_nopkg \
                                    )
+
         stub_sis_target.depends += $${baseTarget}_stub.pkg
 
         ok_stub_sis_target.target = ok_stub_sis
@@ -132,7 +116,6 @@ equals(GENERATE_SIS_TARGETS, true) {
                                ok_installer_sis_target \
                                unsigned_installer_sis_target \
                                ok_unsigned_installer_sis_target \
-                               fail_sis_nopkg_target \
                                fail_sis_nocache_target \
                                stub_sis_target \
                                ok_stub_sis_target
@@ -178,10 +161,14 @@ equals(GENERATE_SIS_TARGETS, true) {
         target_sis_target.commands = $(MAKE) -f $(MAKEFILE) sis
 
         installer_sis_target.target = installer_sis
-        installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
-                                            $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
+        installer_sis_target.commands = $(MAKE) -f $(MAKEFILE) ok_installer_sis
         installer_sis_target.depends = $${baseTarget}_installer.pkg sis
 
+        ok_installer_sis_target.target = ok_installer_sis
+        ok_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) $${baseTarget}_installer.pkg - \
+                                            $(QT_SIS_CERTIFICATE) $(QT_SIS_KEY) $(QT_SIS_PASSPHRASE)
+        ok_installer_sis_target.depends = $${baseTarget}_installer.pkg
+
         unsigned_installer_sis_target.target = unsigned_installer_sis
         unsigned_installer_sis_target.commands = $$QMAKE_CREATEPACKAGE $(QT_SIS_OPTIONS) -o $${baseTarget}_installer.pkg
         unsigned_installer_sis_target.depends = $${baseTarget}_installer.pkg unsigned_sis
@@ -197,6 +184,7 @@ equals(GENERATE_SIS_TARGETS, true) {
                                unsigned_sis_target \
                                target_sis_target \
                                installer_sis_target \
+                               ok_installer_sis_target \
                                unsigned_installer_sis_target
 
         QMAKE_DISTCLEAN += $${sis_destdir}/$${baseTarget}.sis