update xca.pro and qmake

INSTALL.qmake

@@ -7,6 +7,8 @@ for building. Maybe this will help ,if you have a weired setup.
 
 $ qmake -o makefile
 
+At least on debian, the qmake command is "qmake-qt4"
+
 creates the makefile. I recommend makefile to not overwrite Makefile
 and also assures, that it is used instead of the original Makefile.
 

mkxcapro.sh

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-P=xca.pro
-
-if [ -e Makefile ]; then
-	make distclean
-fi
-
-echo -n "Creating $P ..."
-
-echo "HEADERS = "`ls lib/*.h` `ls widgets/*.h`  >$P
-echo "SOURCES = "`ls lib/*.cpp` `ls widgets/*.cpp` >>$P
-echo "FORMS = "`ls ui/*.ui` >>$P
-echo "TRANSLATIONS = "`ls lang/xca_??.ts` >>$P
-echo "TARGET = xca" >>$P
-
-echo "  done"
-
-

xca.pro

@@ -1,6 +1,3 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Mo Apr 9 13:16:01 2007
-######################################################################
 
 TEMPLATE = app
 TARGET = xca
@@ -13,25 +10,17 @@ RC_FILE = img/w32res.rc
 macx {
 	ICON = img/xca-mac-icon.icns
 	CONFIG += release_and_debug
-	QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4
-	QMAKE_MAC_SDK=/Developer/SDKs/MacOSX10.4u.sdk
-	# The condition below does not seem to work the way it first appeared to,
-	# qmake doesn't seem to offer any facility to control release -vs- debug within the same xcode
-	# project, so for now all the mac builds will be universal. This has been reported to trolltech.
-	#!debug {
-	CONFIG += x86 ppc
-	#}
 	XCA_RESOURCES.files = misc/oids.txt misc/aia.txt misc/CA.xca misc/dn.txt misc/eku.txt misc/HTTPS_client.xca misc/HTTPS_server.xca
-	# XXX *** I haven't tested the localizations, but I think they'll need to land here to be used based on reading the code
 	XCA_RESOURCES.files += lang/xca_de.ts lang/xca_es.ts
 	XCA_RESOURCES.path = Contents/Resources
 	QMAKE_BUNDLE_DATA += XCA_RESOURCES
 }
 
-LIBS += -lcrypto
+LIBS += -lcrypto -lltdl
 
 # Input
-HEADERS += lib/asn1int.h \
+HEADERS += local.h \
+           lib/asn1int.h \
            lib/asn1time.h \
            lib/base.h \
            lib/db.h \
@@ -60,6 +49,10 @@ HEADERS += lib/asn1int.h \
            lib/x509name.h \
            lib/x509rev.h \
            lib/x509v3ext.h \
+           lib/opensc-pkcs11.h \
+           lib/pk11_attribute.h \
+           lib/pki_evp.h \
+           lib/pki_scard.h \
            widgets/CertDetail.h \
            widgets/CertExtend.h \
            widgets/clicklabel.h \
@@ -77,8 +70,8 @@ HEADERS += lib/asn1int.h \
            widgets/ReqDetail.h \
            widgets/v3ext.h \
            widgets/validity.h \
-           widgets/XcaTreeView.h \
-           widgets/MW_menu.cpp
+           widgets/NewKey.h \
+           widgets/XcaTreeView.h
 FORMS += ui/About.ui \
          ui/CaProperties.ui \
          ui/CertDetail.ui \
@@ -115,7 +108,6 @@ SOURCES += lib/asn1int.cpp \
            lib/load_obj.cpp \
            lib/main.cpp \
            lib/oid.cpp \
-           lib/pass_info.cpp \
            lib/pki_base.cpp \
            lib/pki_crl.cpp \
            lib/pki_key.cpp \
@@ -129,6 +121,11 @@ SOURCES += lib/asn1int.cpp \
            lib/x509name.cpp \
            lib/x509rev.cpp \
            lib/x509v3ext.cpp \
+           lib/pk11_attribute.cpp \
+           lib/pkcs11.cpp \
+           lib/pki_evp.cpp \
+           lib/pki_scard.cpp \
+           widgets/NewKey.cpp \
            widgets/CertDetail.cpp \
            widgets/CertExtend.cpp \
            widgets/clicklabel.cpp \
@@ -143,12 +140,12 @@ SOURCES += lib/asn1int.cpp \
            widgets/MainWindow.cpp \
            widgets/MW_database.cpp \
            widgets/MW_help.cpp \
-           widgets/MW_menu.cpp \
            widgets/NewX509.cpp \
            widgets/NewX509_ext.cpp \
 	   widgets/Options.cpp \
            widgets/ReqDetail.cpp \
            widgets/v3ext.cpp \
            widgets/validity.cpp \
-           widgets/XcaTreeView.cpp
+           widgets/XcaTreeView.cpp \
+           widgets/MW_menu.cpp
 TRANSLATIONS += lang/xca_de.ts lang/xca_es.ts