Attachment #119939 for bug #137132




public:
	qc_qca(Conf *c) : ConfObj(c) {}
	QString name() const { return "QCA 2.0"; }
	QString shortname() const { return "qca2"; }
	bool exec()
	{
		// get the build mode

			"CONFIG += qt \n"
			"QT -= gui\n"
			"INCLUDEPATH += ../../../../include/QtCrypto \n"
			"LIBS += -L../../../../lib -lqca2 \n";
		} else {
			proextra =
			"CONFIG += qt crypto\n"


		if (!arg.isEmpty()) {
			conf->addIncludePath("../../include/QtCrypto");
			conf->addLib("-L../../lib -lqca2");
		}
		return true;
	}




public:
	qc_qca(Conf *c) : ConfObj(c) {}
	QString name() const { return "QCA 2.0"; }
	QString shortname() const { return "qca2"; }
	bool exec()
	{
		// get the build mode

			"CONFIG += qt \n"
			"QT -= gui\n"
			"INCLUDEPATH += ../../../../include/QtCrypto \n"
			"LIBS += -L../../../../lib -lqca2 \n";
		} else {
			proextra =
			"CONFIG += qt crypto\n"


		if (!arg.isEmpty()) {
			conf->addIncludePath("../../include/QtCrypto");
			conf->addLib("-L../../lib -lqca2");
		}
		return true;
	}

Return to bug 137132

Lines 329-335 Link Here

(-)qca-openssl-0.1-20070508-orig/configure (-3 / +3 lines)
329	public:	329	public:
330	qc_qca(Conf *c) : ConfObj(c) {}	330	qc_qca(Conf *c) : ConfObj(c) {}
331	QString name() const { return "QCA 2.0"; }	331	QString name() const { return "QCA 2.0"; }
332	QString shortname() const { return "qca"; }	332	QString shortname() const { return "qca2"; }
333	bool exec()	333	bool exec()
334	{	334	{
335	// get the build mode	335	// get the build mode
Lines 352-358 Link Here
352	"CONFIG += qt \n"	352	"CONFIG += qt \n"
353	"QT -= gui\n"	353	"QT -= gui\n"
354	"INCLUDEPATH += ../../../../include/QtCrypto \n"	354	"INCLUDEPATH += ../../../../include/QtCrypto \n"
355	"LIBS += -L../../../../lib -lqca \n";	355	"LIBS += -L../../../../lib -lqca2 \n";
356	} else {	356	} else {
357	proextra =	357	proextra =
358	"CONFIG += qt crypto\n"	358	"CONFIG += qt crypto\n"
Lines 387-393 Link Here
387		387
388	if (!arg.isEmpty()) {	388	if (!arg.isEmpty()) {
389	conf->addIncludePath("../../include/QtCrypto");	389	conf->addIncludePath("../../include/QtCrypto");
390	conf->addLib("-L../../lib -lqca");	390	conf->addLib("-L../../lib -lqca2");
391	}	391	}
392	return true;	392	return true;
393	}	393	}

Lines 13-19 Link Here

(-)qca-openssl-0.1-20070508-orig/qca.qcm (-3 / +3 lines)
13	public:	13	public:
14	qc_qca(Conf *c) : ConfObj(c) {}	14	qc_qca(Conf *c) : ConfObj(c) {}
15	QString name() const { return "QCA 2.0"; }	15	QString name() const { return "QCA 2.0"; }
16	QString shortname() const { return "qca"; }	16	QString shortname() const { return "qca2"; }
17	bool exec()	17	bool exec()
18	{	18	{
19	// get the build mode	19	// get the build mode
Lines 36-42 Link Here
36	"CONFIG += qt \n"	36	"CONFIG += qt \n"
37	"QT -= gui\n"	37	"QT -= gui\n"
38	"INCLUDEPATH += ../../../../include/QtCrypto \n"	38	"INCLUDEPATH += ../../../../include/QtCrypto \n"
39	"LIBS += -L../../../../lib -lqca \n";	39	"LIBS += -L../../../../lib -lqca2 \n";
40	} else {	40	} else {
41	proextra =	41	proextra =
42	"CONFIG += qt crypto\n"	42	"CONFIG += qt crypto\n"
Lines 71-77 Link Here
71		71
72	if (!arg.isEmpty()) {	72	if (!arg.isEmpty()) {
73	conf->addIncludePath("../../include/QtCrypto");	73	conf->addIncludePath("../../include/QtCrypto");
74	conf->addLib("-L../../lib -lqca");	74	conf->addLib("-L../../lib -lqca2");
75	}	75	}
76	return true;	76	return true;
77	}	77	}