diff --git a/qcm/qca.qcm b/qcm/qca.qcm
index edc42df..45e011f 100644
--- a/qcm/qca.qcm
+++ b/qcm/qca.qcm
@@ -32,10 +32,19 @@ static QString internal_crypto_prf(const QString &incdir, const QString &libdir,
"isEmpty(LINKAGE) {\n"
" !isEmpty(QCA_INCDIR):INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n"
" !isEmpty(QCA_LIBDIR):LIBS += -L$$QCA_LIBDIR\n"
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+" LINKAGE = -lqca-qt5\n"
+#else
" LINKAGE = -lqca\n"
+#endif
" CONFIG(debug, debug|release) {\n"
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) /* unchecked. real names may differ */
+" windows:LINKAGE = -lqca-qt5d\n"
+" mac:LINKAGE = -lqca-qt5_debug\n"
+#else
" windows:LINKAGE = -lqcad\n"
" mac:LINKAGE = -lqca_debug\n"
+#endif
" }\n"
"}\n"
"\n"
@@ -48,7 +57,7 @@ static QString internal_crypto_prf(const QString &incdir, const QString &libdir,
static bool qca_try(Conf *conf, const QString &incdir, const QString &libdir, const QString &frameworkdir, bool release, bool debug, QString *_prf)
{
QString proextra;
- QString prf = internal_crypto_prf(incdir, libdir, frameworkdir);
+ QString prf = internal_crypto_prf(conf->escapePath(incdir), conf->escapePath(libdir), frameworkdir);
proextra =
"CONFIG += qt\n"
"CONFIG -= debug_and_release debug release\n"
diff --git a/qcm/recursiveprl.qcm b/qcm/recursiveprl.qcm
index b0c6d43..a349839 100644
--- a/qcm/recursiveprl.qcm
+++ b/qcm/recursiveprl.qcm
@@ -91,9 +91,9 @@ public:
if(!conf->DEFINES.isEmpty())
str += "DEFINES += " + conf->DEFINES + '\n';
if(!conf->INCLUDEPATH.isEmpty())
- str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n';
+ str += "INCLUDEPATH += " + conf->escapedIncludes() + '\n';
if(!conf->LIBS.isEmpty())
- str += "LIBS += " + conf->LIBS + '\n';
+ str += "LIBS += " + conf->escapedLibs() + '\n';
if(!conf->extra.isEmpty())
str += conf->extra;
str += '\n';
diff --git a/qcm/zlib.qcm b/qcm/zlib.qcm
index 86b97fb..808e296 100644
--- a/qcm/zlib.qcm
+++ b/qcm/zlib.qcm
@@ -33,8 +33,7 @@ public:
if(!conf->findHeader("zlib.h", QStringList(), &s))
return false;
}
- incs.append(s.replace("\\\", "\\\\\\\"));
-
+
s = conf->getenv("QC_WITH_ZLIB_LIB");
if(!s.isEmpty()) {
if(!conf->checkLibrary(s, "z"))
@@ -45,7 +44,7 @@ public:
return false;
}
if (!s.isEmpty()) {
- libs = QString("-L%1 -lz").arg(s.replace("\\\", "\\\\\\\"));
+ libs = QString("-L%1 -lz").arg(s);
} else {
libs = s.isEmpty()? "-lz" : QString("-L%1 -lz").arg(s);
}