diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2012-08-24 11:56:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-05 11:54:22 +0200 |
| commit | ff158f9cab2f476b7febbfaaeeae9df71e9a3bb3 (patch) | |
| tree | 098397f5efa3874b9863b422ea73a37f3e3243b0 | |
| parent | 9ad88ee03762bf3a0a398da7c5373bd1b9c1cfe7 (diff) | |
lupdate: use QMAKE_MANIFEST to embed our special manifest file
Task-number: QTBUG-27080
Change-Id: Ieacc116ef091f0473f2c543a76685f7c851a2456
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/linguist/lupdate/lupdate.pro | 2 | ||||
| -rw-r--r-- | src/linguist/lupdate/winmanifest.rc | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/linguist/lupdate/lupdate.pro b/src/linguist/lupdate/lupdate.pro index a40005d2e..67a5aaced 100644 --- a/src/linguist/lupdate/lupdate.pro +++ b/src/linguist/lupdate/lupdate.pro @@ -30,7 +30,7 @@ HEADERS += \ lupdate.h \ ../shared/simtexth.h -win32:RC_FILE = winmanifest.rc +win32:QMAKE_MANIFEST = lupdate.exe.manifest embed_manifest_exe:win32-msvc2005 { # The default configuration embed_manifest_exe overrides the manifest file diff --git a/src/linguist/lupdate/winmanifest.rc b/src/linguist/lupdate/winmanifest.rc deleted file mode 100644 index 45c493576..000000000 --- a/src/linguist/lupdate/winmanifest.rc +++ /dev/null @@ -1,4 +0,0 @@ -#define RT_MANIFEST 24 -#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 - -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "lupdate.exe.manifest" |