Attachment #464108 for bug #607644

View | Details | Raw Unified | Return to bug 607644
Collapse All | Expand All




			return false;
		}

		QFileInfo fi(qc_getenv("QC_COMMAND"));
		QStringList args;
		args += "-prl";
		args += "-r";
		args += fi.dir().filePath(qc_getenv("QC_PROFILE"));
		if(conf->doCommand(conf->qmake_path, args) != 0)
		{
			success = false;

		if(!conf->DEFINES.isEmpty())
			str += "DEFINES += " + conf->DEFINES + '\n';
		if(!conf->INCLUDEPATH.isEmpty())
			str += "INCLUDEPATH += " + conf->escapedIncludes() + '\n';
		if(!conf->LIBS.isEmpty())
			str += "LIBS += " + conf->escapedLibs() + '\n';
		if(!conf->extra.isEmpty())
			str += conf->extra;
		str += '\n';

Lines 21-26 public: Link Here

(-)a/qcm/zlib.qcm (-11 / +29 lines)
21	QStringList incs;	21	QStringList incs;
22	QString version, libs, other;	22	QString version, libs, other;
23	QString s;	23	QString s;
		24
		25
24		26
25	if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {	27	if(!conf->findPkgConfig("zlib", VersionAny, "", &version, &incs, &libs, &other)) {
26		28
Lines 33-53 public: Link Here
33	if(!conf->findHeader("zlib.h", QStringList(), &s))	35	if(!conf->findHeader("zlib.h", QStringList(), &s))
34	return false;	36	return false;
35	}	37	}
36	incs.append(s.replace("\\\", "\\\\\\\"));
37		38
38	s = conf->getenv("QC_WITH_ZLIB_LIB");	39	QStringList libNames = QStringList() << "z";
39	if(!s.isEmpty()) {	40	QString libName;
40	if(!conf->checkLibrary(s, "z"))	41	#ifdef Q_OS_WIN
41	return false;	42	libNames << (qc_buildmode_debug? "zlibd" : "zlib");
42	}	43	#endif
43	else {	44	for (;;) {
44	if(!conf->findLibrary("z", &s))	45	s = conf->getenv("QC_WITH_ZLIB_LIB");
45	return false;	46	if(!s.isEmpty()) {
		47	foreach (const QString l, libNames)
		48	if(conf->checkLibrary(s, l)) {
		49	libName = l;
		50	break;
		51	}
		52	} else {
		53	foreach (const QString l, libNames)
		54	if(conf->findLibrary(l, &s)) {
		55	libName = l;
		56	break;
		57	}
		58	}
		59
		60	if(!libName.isEmpty())
		61	break;
		62
		63	return false;
46	}	64	}
47	if (!s.isEmpty()) {	65	if (!s.isEmpty()) {
48	libs = QString("-L%1 -lz").arg(s.replace("\\\", "\\\\\\\"));	66	libs = QString("-L%1 -l%2").arg(s, libName);
49	} else {	67	} else {
50	libs = s.isEmpty()? "-lz" : QString("-L%1 -lz").arg(s);	68	libs = s.isEmpty()? QString("-l")+libName : QString("-L%1 -l%2").arg(s, libName);
51	}	69	}
52	}	70	}
53		71

Return to bug 607644

Lines 39-48 public: Link Here

(-)a/qcm/recursiveprl.qcm (-3 / +4 lines)
39	return false;	39	return false;
40	}	40	}
41		41
		42	QFileInfo fi(qc_getenv("QC_COMMAND"));
42	QStringList args;	43	QStringList args;
43	args += "-prl";	44	args += "-prl";
44	args += "-r";	45	args += "-r";
45	args += qc_getenv("QC_PROFILE");	46	args += fi.dir().filePath(qc_getenv("QC_PROFILE"));
46	if(conf->doCommand(conf->qmake_path, args) != 0)	47	if(conf->doCommand(conf->qmake_path, args) != 0)
47	{	48	{
48	success = false;	49	success = false;
Lines 91-99 public: Link Here
91	if(!conf->DEFINES.isEmpty())	92	if(!conf->DEFINES.isEmpty())
92	str += "DEFINES += " + conf->DEFINES + '\n';	93	str += "DEFINES += " + conf->DEFINES + '\n';
93	if(!conf->INCLUDEPATH.isEmpty())	94	if(!conf->INCLUDEPATH.isEmpty())
94	str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n';	95	str += "INCLUDEPATH += " + conf->escapedIncludes() + '\n';
95	if(!conf->LIBS.isEmpty())	96	if(!conf->LIBS.isEmpty())
96	str += "LIBS += " + conf->LIBS + '\n';	97	str += "LIBS += " + conf->escapedLibs() + '\n';
97	if(!conf->extra.isEmpty())	98	if(!conf->extra.isEmpty())
98	str += conf->extra;	99	str += conf->extra;
99	str += '\n';	100	str += '\n';