From 7da29f7654b1b7010f9ab61566ab7e7a84997a5d Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 23 Feb 2017 23:09:33 +0800 Subject: [PATCH 1/2] Embed manifest when compiling with MSVC Update manifest --- src/app/CMakeLists.txt | 1 + src/qbittorrent.exe.manifest | 47 ++++++++++++++++++++++++++++++------ winconf-msvc.pri | 2 +- 3 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 0dffffe49..3e6228986 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -55,6 +55,7 @@ if (WIN32) else (MINGW) list (APPEND QBT_APP_SOURCES ../qbittorrent.rc) endif (MINGW) + list(APPEND QBT_APP_SOURCES ../qbittorent.exe.manifest) endif (WIN32) if (UNIX) diff --git a/src/qbittorrent.exe.manifest b/src/qbittorrent.exe.manifest index 2f99a7ec8..7e966371c 100644 --- a/src/qbittorrent.exe.manifest +++ b/src/qbittorrent.exe.manifest @@ -1,8 +1,39 @@ - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/winconf-msvc.pri b/winconf-msvc.pri index ca77d8b96..65af90f7d 100644 --- a/winconf-msvc.pri +++ b/winconf-msvc.pri @@ -11,7 +11,7 @@ strace_win { LIBS += dbghelp.lib } -QMAKE_LFLAGS += "/OPT:REF /OPT:ICF" +QMAKE_LFLAGS += "/OPT:REF /OPT:ICF /MANIFEST:EMBED /MANIFESTINPUT:$$quote($${PWD}/src/qbittorrent.exe.manifest)" RC_FILE = qbittorrent.rc From 38063c388e32804b2ee4052264587b825b683d2c Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Thu, 23 Feb 2017 23:10:19 +0800 Subject: [PATCH 2/2] Capitalize title strings Remove DISCARDABLE keyword which is ignored on 32-bit windows --- src/qbittorrent.rc | Bin 2836 -> 2788 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/qbittorrent.rc b/src/qbittorrent.rc index 6b2d17f24b4ee5d8e7a5e55f4fd41a324186ccbd..65e480bf781f9d4eceb711b029ba48d00c9765ff 100644 GIT binary patch delta 39 tcmbOt_C$1o!ekW=iHQMPAZp_(5jMtv&HLFTnHU2m?`JdLEWpXa1OW6y3m5