diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 18:37:26 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 18:37:26 +0100 |
commit | 852f4e4cf87d7db0eaa87384b1589e151f76e6cd (patch) | |
tree | 73bc838da6bde8b66e26c2e1a34ff319584edf82 /src/winrtrunner/winrtrunner.pro | |
parent | 863a6621d14caf67adcf3f30cb955a268765f0f1 (diff) | |
parent | 98eebb2dc1830b262d72e748817aee25e54d0d35 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ibd5f6052bd07152fbe344505308563d9857771e9
Diffstat (limited to 'src/winrtrunner/winrtrunner.pro')
-rw-r--r-- | src/winrtrunner/winrtrunner.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/winrtrunner/winrtrunner.pro b/src/winrtrunner/winrtrunner.pro index c98f0df70..73ca2cdd4 100644 --- a/src/winrtrunner/winrtrunner.pro +++ b/src/winrtrunner/winrtrunner.pro @@ -17,4 +17,7 @@ win32-msvc2013|win32-msvc2015 { include(../shared/corecon/corecon.pri) } +# Windows 10 requires signing +*msvc2015: LIBS += -lcrypt32 + load(qt_tool) |