diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-10-27 15:58:00 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2014-10-27 17:26:26 +0100 |
| commit | 6cc09920176a53e43c695ab3e0a572ca2dae46cf (patch) | |
| tree | 42d7bcfffe210e7dfe5ed82caa297913b1645f95 /src/lib/qtprofilesetup/templates | |
| parent | e0e0c6369cc0f5490a1ddb8b3a991f93355aeec1 (diff) | |
set up entry point libs in Qt.core
Let the Qt profile setup write the entry point libs to Qt's core.qbs.
Also, add shell32.lib to MSVC if we have a Qt >= 5.4.
Change-Id: I8ade1141101ac7494031ad49e78ba63be0342f03
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/qtprofilesetup/templates')
| -rw-r--r-- | src/lib/qtprofilesetup/templates/core.qbs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/qtprofilesetup/templates/core.qbs b/src/lib/qtprofilesetup/templates/core.qbs index a8d40ce16..eae926d85 100644 --- a/src/lib/qtprofilesetup/templates/core.qbs +++ b/src/lib/qtprofilesetup/templates/core.qbs @@ -105,8 +105,10 @@ Module { var libs = []; if (staticBuild) libs.push(libFilePath); - if (qbs.targetOS.contains('windows') && !product.consoleApplication) - libs.push("qtmain" + libInfix + (cpp.debugInformation ? "d" : "") + (!qbs.toolchain.contains("mingw") ? ".lib" : "")); + if (qbs.targetOS.contains('windows') && !product.consoleApplication) { + libs = libs.concat(qtBuildVariant === "debug" + ? @entryPointLibsDebug@ : @entryPointLibsRelease@); + } libs = libs.concat(staticLibs); return libs; } |