Attachment 1106318 Details for Bug 1292008 – Patch to support qconf-2.0

[patch] Patch to support qconf-2.0

psi-qconf-2.0.patch (text/plain), 1.52 KB, created by Ivan Romanov on 2015-12-16 08:09:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Romanov

Created: 2015-12-16 08:09:43 UTC

Size: 1.52 KB

patch

obsolete

>diff --git a/qcm/recursiveprl.qcm b/qcm/recursiveprl.qcm
>index b0c6d43..68e1115 100644
>--- a/qcm/recursiveprl.qcm
>+++ b/qcm/recursiveprl.qcm
>@@ -39,10 +39,11 @@ public:
> 			return false;
> 		}
> 
>+		QFileInfo fi(qc_getenv("QC_COMMAND"));
> 		QStringList args;
> 		args += "-prl";
> 		args += "-r";
>-		args += qc_getenv("QC_PROFILE");
>+		args += fi.dir().filePath(qc_getenv("QC_PROFILE"));
> 		if(conf->doCommand(conf->qmake_path, args) != 0)
> 		{
> 			success = false;
>@@ -91,9 +92,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);
> 			}

Actions: View | Diff

Attachments on bug 1292008: 1106318