[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/qca
From:       Justin Karneges <infiniti () affinix ! com>
Date:       2008-06-04 0:48:49
Message-ID: 1212540529.147748.2561.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 816489 by infiniti:

QMAKE_FRAMEWORKPATH doesn't work in Qt 4.2.0.  use LIBS with -F instead.


 M  +2 -1      crypto.prf.in  
 M  +14 -13    qcm/qca.qcm  


--- trunk/kdesupport/qca/crypto.prf.in #816488:816489
@@ -18,7 +18,8 @@
 mac: {
 	framework_dir = $$QCA_LIBDIR
 	exists($$framework_dir/qca.framework) {
-		QMAKE_FRAMEWORKPATH *= $$framework_dir
+		#QMAKE_FRAMEWORKPATH *= $$framework_dir
+		LIBS += -F$$framework_dir
 		INCLUDEPATH += $$framework_dir/qca.framework/Headers
 		LINKAGE = -framework qca
 	}
--- trunk/kdesupport/qca/qcm/qca.qcm #816488:816489
@@ -18,23 +18,24 @@
 "\n"
 "# on mac, if qca was built as a framework, link against it\n"
 "mac: {\n"
-"        framework_dir = $$QCA_LIBDIR\n"
-"        exists($$framework_dir/qca.framework) {\n"
-"                QMAKE_FRAMEWORKPATH *= $$framework_dir\n"
-"                INCLUDEPATH += $$framework_dir/qca.framework/Headers\n"
-"                LINKAGE = -framework qca\n"
-"        }\n"
+"	framework_dir = $$QCA_LIBDIR\n"
+"	exists($$framework_dir/qca.framework) {\n"
+"		#QMAKE_FRAMEWORKPATH *= $$framework_dir\n"
+"		LIBS += -F$$framework_dir\n"
+"		INCLUDEPATH += $$framework_dir/qca.framework/Headers\n"
+"		LINKAGE = -framework qca\n"
+"	}\n"
 "}\n"
 "\n"
 "# else, link normally\n"
 "isEmpty(LINKAGE) {\n"
-"        INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n"
-"        LIBS += -L$$QCA_LIBDIR\n"
-"        LINKAGE = -lqca\n"
-"        CONFIG(debug, debug|release) {\n"
-"                windows:LINKAGE = -lqcad\n"
-"                mac:LINKAGE = -lqca_debug\n"
-"        }\n"
+"	INCLUDEPATH += $$QCA_INCDIR/QtCrypto\n"
+"	LIBS += -L$$QCA_LIBDIR\n"
+"	LINKAGE = -lqca\n"
+"	CONFIG(debug, debug|release) {\n"
+"		windows:LINKAGE = -lqcad\n"
+"		mac:LINKAGE = -lqca_debug\n"
+"	}\n"
 "}\n"
 "\n"
 "LIBS += $$LINKAGE\n"
[prev in list] [next in list] [prev in thread] [next in thread]