Attachment #89489 for bug #129536

Lines 5-9 Link Here

(-)qca-2.0-beta2-orig/examples/examples.pri (-1 / +1 lines)
5	LIBS += -L../../lib	5	LIBS += -L../../lib
6		6
7	# link	7	# link
8	LIBS += -lqca	8	LIBS += -lqca-2
9		9

Lines 48-54 Link Here

(-)qca-2.0-beta2-orig/extra.qcm (-2 / +2 lines)
48	"CONFIG *= qt\n"	48	"CONFIG *= qt\n"
49	"INCLUDEPATH += %1/include/QtCrypto\n").arg(prefix);	49	"INCLUDEPATH += %1/include/QtCrypto\n").arg(prefix);
50	str += QString(	50	str += QString(
51	"LIBS += -L%1/lib -lqca\n").arg(prefix);	51	"LIBS += -L%1/lib -lqca-2\n").arg(prefix);
52		52
53	f.setFileName("crypto.prf");	53	f.setFileName("crypto.prf");
54	if(f.open(QFile::WriteOnly \| QFile::Truncate))	54	if(f.open(QFile::WriteOnly \| QFile::Truncate))
Lines 74-80 Link Here
74	"Description: Qt Cryptographic Architecture library\n"	74	"Description: Qt Cryptographic Architecture library\n"
75	"Version: 2.0.0 #maybe this shouldn't be literal...\n"	75	"Version: 2.0.0 #maybe this shouldn't be literal...\n"
76	"Requires: %2\n"	76	"Requires: %2\n"
77	"Libs: -L${libdir} -lqca\n"	77	"Libs: -L${libdir} -lqca-2\n"
78	"Cflags: -I${includedir}\n"	78	"Cflags: -I${includedir}\n"
79	"\n"	79	"\n"
80	).arg(prefix).arg(qtcore);	80	).arg(prefix).arg(qtcore);

Lines 6-12 Link Here

(-)qca-2.0-beta2-orig/src/src.pro (-1 / +1 lines)
6		6
7	TEMPLATE = lib	7	TEMPLATE = lib
8	QT -= gui	8	QT -= gui
9	TARGET = qca	9	TARGET = qca-2
10	DESTDIR = $$QCA_BASE/lib	10	DESTDIR = $$QCA_BASE/lib
11		11
12	MOC_DIR = .moc	12	MOC_DIR = .moc

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/base64unittest/base64unittest.pro (-1 / +1 lines)
2	TARGET = base64unittest	2	TARGET = base64unittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/bigintunittest/bigintunittest.pro (-1 / +1 lines)
2	TARGET = bigintunittest	2	TARGET = bigintunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/certunittest/certunittest.pro (-1 / +1 lines)
2	TARGET = certunittest	2	TARGET = certunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/filewatchunittest/filewatchunittest.pro (-1 / +1 lines)
2	TARGET = filewatchunittest	2	TARGET = filewatchunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/hashunittest/hashunittest.pro (-1 / +1 lines)
2	TARGET = hashunittest	2	TARGET = hashunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/hexunittest/hexunittest.pro (-1 / +1 lines)
2	TARGET = hexunittest	2	TARGET = hexunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/kdfunittest/kdfunittest.pro (-1 / +1 lines)
2	TARGET = kdfunittest	2	TARGET = kdfunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/keygenunittest/keygenunittest.pro (-1 / +1 lines)
2	TARGET = keygenunittest	2	TARGET = keygenunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	# check target	7	# check target
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/keylengthunittest/keylengthunittest.pro (-1 / +1 lines)
2	TARGET = keylengthunittest	2	TARGET = keylengthunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/macunittest/macunittest.pro (-1 / +1 lines)
2	TARGET = macunittest	2	TARGET = macunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/pkits/pkits.pro (-1 / +1 lines)
2	TARGET = pkits	2	TARGET = pkits
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/randomunittest/randomunittest.pro (-1 / +1 lines)
2	TARGET = randomunittest	2	TARGET = randomunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/rsaunittest/rsaunittest.pro (-1 / +1 lines)
2	TARGET = rsaunittest	2	TARGET = rsaunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/securearrayunittest/securearrayunittest.pro (-1 / +1 lines)
2	TARGET = securearrayunittest	2	TARGET = securearrayunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/staticunittest/staticunittest.pro (-1 / +1 lines)
2	TARGET = staticunittest	2	TARGET = staticunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/symmetrickeyunittest/symmetrickeyunittest.pro (-1 / +1 lines)
2	TARGET = symmetrickeyunittest	2	TARGET = symmetrickeyunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/tls/tls.pro (-1 / +1 lines)
2	TARGET = tlsunittest	2	TARGET = tlsunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 4-10 Link Here

(-)qca-2.0-beta2-orig/tools/mozcerts/mozcerts.pro (-1 / +1 lines)
4	include(../../confapp.pri)	4	include(../../confapp.pri)
5		5
6	INCLUDEPATH += ../../include/QtCrypto	6	INCLUDEPATH += ../../include/QtCrypto
7	LIBS += -L../../lib -lqca	7	LIBS += -L../../lib -lqca-2
8		8
9	SOURCES += main.cpp	9	SOURCES += main.cpp
10		10

Lines 5-11 Link Here

(-)qca-2.0-beta2-orig/tools/qcatool/qcatool.pro (-1 / +1 lines)
5	DESTDIR = ../../bin	5	DESTDIR = ../../bin
6		6
7	INCLUDEPATH += ../../include/QtCrypto	7	INCLUDEPATH += ../../include/QtCrypto
8	LIBS += -L../../lib -lqca	8	LIBS += -L../../lib -lqca-2
9		9
10	SOURCES += main.cpp	10	SOURCES += main.cpp
11		11

Lines 442-448 Link Here

(-)qca-2.0-beta2-orig/configure (-2 / +2 lines)
442	"CONFIG *= qt\n"	442	"CONFIG *= qt\n"
443	"INCLUDEPATH += %1/include/QtCrypto\n").arg(prefix);	443	"INCLUDEPATH += %1/include/QtCrypto\n").arg(prefix);
444	str += QString(	444	str += QString(
445	"LIBS += -L%1/lib -lqca\n").arg(prefix);	445	"LIBS += -L%1/lib -lqca-2\n").arg(prefix);
446		446
447	f.setFileName("crypto.prf");	447	f.setFileName("crypto.prf");
448	if(f.open(QFile::WriteOnly \| QFile::Truncate))	448	if(f.open(QFile::WriteOnly \| QFile::Truncate))
Lines 468-474 Link Here
468	"Description: Qt Cryptographic Architecture library\n"	468	"Description: Qt Cryptographic Architecture library\n"
469	"Version: 2.0.0 #maybe this shouldn't be literal...\n"	469	"Version: 2.0.0 #maybe this shouldn't be literal...\n"
470	"Requires: %2\n"	470	"Requires: %2\n"
471	"Libs: -L\${libdir} -lqca\n"	471	"Libs: -L\${libdir} -lqca-2\n"
472	"Cflags: -I\${includedir}\n"	472	"Cflags: -I\${includedir}\n"
473	"\n"	473	"\n"
474	).arg(prefix).arg(qtcore);	474	).arg(prefix).arg(qtcore);

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/cipherunittest/cipherunittest.pro (-1 / +1 lines)
2	TARGET = cipherunittest	2	TARGET = cipherunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Lines 2-8 Link Here

(-)qca-2.0-beta2-orig/unittest/dsaunittest/dsaunittest.pro (-1 / +1 lines)
2	TARGET = dsaunittest	2	TARGET = dsaunittest
3	DEPENDPATH += .	3	DEPENDPATH += .
4	INCLUDEPATH += ../../include/QtCrypto	4	INCLUDEPATH += ../../include/QtCrypto
5	LIBS += -L../../lib -lqca	5	LIBS += -L../../lib -lqca-2
6	CONFIG += qtestlib thread console	6	CONFIG += qtestlib thread console
7	QT -= gui	7	QT -= gui
8		8

Return to bug 129536