From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 17 Sep 2012 15:06:45 +0000 (+0200)
Subject: remove hand-written manifest
X-Git-Tag: accepted/tizen/20131212.181521~214
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb7a795b20d7ab28c36c5f05c2b994aab5348095;p=platform%2Fupstream%2Fqttools.git

remove hand-written manifest

it seems that with msvc 2008 (now the first supported version)
the necessary entry is added to the auto-generated manifest, so get rid
of the hand-written one.

Change-Id: Ibc49ee246f28e432f2ff0b2fedc32dd3aa620c7f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---

diff --git a/src/linguist/lupdate/lupdate.exe.manifest b/src/linguist/lupdate/lupdate.exe.manifest
deleted file mode 100644
index e0b2f73..0000000
--- a/src/linguist/lupdate/lupdate.exe.manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1"
-          manifestVersion="1.0">
-  <!-- Make sure Vista UAC does not believe lupdate is an installer -->
-  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
-    <security>
-      <requestedPrivileges>
-        <requestedExecutionLevel
-          level="asInvoker"
-          uiAccess="false"/>
-      </requestedPrivileges>
-    </security>
-  </trustInfo>
-</assembly>
\ No newline at end of file
diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro
index 40a9daf..68178c2 100644
--- a/src/linguist/lupdate/lupdate.pro
+++ b/src/linguist/lupdate/lupdate.pro
@@ -28,14 +28,6 @@ HEADERS += \
     lupdate.h \
     ../shared/simtexth.h
 
-win32:QMAKE_MANIFEST = lupdate.exe.manifest
-
-embed_manifest_exe:win32-msvc2005 {
-    # The default configuration embed_manifest_exe overrides the manifest file
-    # already embedded via RC_FILE. Vs2008 already have the necessary manifest entry
-    QMAKE_POST_LINK += $$quote(mt.exe -updateresource:$$DESTDIR/lupdate.exe -manifest \"$${PWD}\\lupdate.exe.manifest\")
-}
-
 qmake.name = QMAKE
 qmake.value = $$shell_path($$QMAKE_QMAKE)
 QT_TOOL_ENV += qmake