summaryrefslogtreecommitdiffstats
path: root/qmake/generators/win32/msvc_nmake.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'qmake/generators/win32/msvc_nmake.cpp')
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp40
1 files changed, 1 insertions, 39 deletions
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 25a2765a01..6f58a9887a 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -28,7 +28,6 @@
#include "msvc_nmake.h"
#include "option.h"
-#include "cesdkhandler.h"
#include <qregexp.h>
#include <qdir.h>
@@ -72,38 +71,7 @@ NmakeMakefileGenerator::writeMakefile(QTextStream &t)
return MakefileGenerator::writeStubMakefile(t);
#endif
if (!project->isHostBuild()) {
- const ProValueMap &variables = project->variables();
- if (project->isActiveConfig("wince")) {
- CeSdkHandler sdkhandler;
- sdkhandler.retrieveAvailableSDKs();
- const QString sdkName = variables["CE_SDK"].join(' ')
- + " (" + variables["CE_ARCH"].join(' ') + ")";
- const QList<CeSdkInfo> sdkList = sdkhandler.listAll();
- CeSdkInfo sdk;
- for (const CeSdkInfo &info : sdkList) {
- if (info.name().compare(sdkName, Qt::CaseInsensitive ) == 0) {
- sdk = info;
- break;
- }
- }
- if (sdk.isValid()) {
- t << "\nINCLUDE = " << sdk.includePath();
- t << "\nLIB = " << sdk.libPath();
- t << "\nPATH = " << sdk.binPath() << "\n";
- } else {
- QStringList sdkStringList;
- sdkStringList.reserve(sdkList.size());
- for (const CeSdkInfo &info : sdkList)
- sdkStringList << info.name();
-
- fprintf(stderr, "Failed to find Windows CE SDK matching %s, found: %s\n"
- "SDK needs to be specified in mkspec (using: %s/qmake.conf)\n"
- "SDK name needs to match the following format: CE_SDK (CE_ARCH)\n",
- qPrintable(sdkName), qPrintable(sdkStringList.join(", ")),
- qPrintable(variables["QMAKESPEC"].first().toQString()));
- return false;
- }
- } else if (project->isActiveConfig(QStringLiteral("winrt"))) {
+ if (project->isActiveConfig(QStringLiteral("winrt"))) {
QString arch = project->first("VCPROJ_ARCH").toQString().toLower();
QString compiler;
QString compilerArch;
@@ -617,12 +585,6 @@ void NmakeMakefileGenerator::writeBuildRulesPart(QTextStream &t)
writeLinkCommand(t);
}
}
- QString signature = !project->isEmpty("SIGNATURE_FILE") ? var("SIGNATURE_FILE") : var("DEFAULT_SIGNATURE");
- bool useSignature = !signature.isEmpty() && !project->isActiveConfig("staticlib") &&
- !project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH");
- if(useSignature) {
- t << "\n\tsigntool sign /F " << escapeFilePath(signature) << " $(DESTDIR_TARGET)";
- }
if(!project->isEmpty("QMAKE_POST_LINK")) {
t << "\n\t" << var("QMAKE_POST_LINK");
}