diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-22 15:13:58 +0200 |
| commit | 4a826ada0486dd2c07b3932c6e62ad375f0edfbb (patch) | |
| tree | 39360b652210c9d92506fe0c0170f8e45a91b159 /src/shared/registryaccess | |
| parent | 582c46d34f28f9e04af4d8179f455a603ded5ec7 (diff) | |
| parent | 427bb8c363fc3ee0d9c12ca7ac01d47dc0f6f8f4 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
qtcreator.pri
qtcreator.qbs
Change-Id: I0cbc9d335073e3234f472aa43f462eef9a9178aa
Diffstat (limited to 'src/shared/registryaccess')
| -rw-r--r-- | src/shared/registryaccess/registryaccess.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/registryaccess/registryaccess.pri b/src/shared/registryaccess/registryaccess.pri index 5ac600b0ef..0a344d6a37 100644 --- a/src/shared/registryaccess/registryaccess.pri +++ b/src/shared/registryaccess/registryaccess.pri @@ -5,6 +5,6 @@ HEADERS += $$PWD/registryaccess.h LIBS *= -lpsapi # PS API and registry functions -win32-msvc* { +msvc { LIBS *= -ladvapi32 } |