by default, all unittests/examples are console without a mac.app bundle

svn path=/trunk/kdesupport/qca/; revision=656265
2025-05-06 15:59:34 +00:00 · 2007-04-20 20:08:47 +00:00 · 2007-04-20 20:08:47 +00:00 · 5c6439a6c1
commit 5c6439a6c1
parent 582c3de181
48 changed files with 40 additions and 201 deletions
--- a/examples/aes-cmac/aes-cmac.pro
+++ b/examples/aes-cmac/aes-cmac.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
-TARGET = aes-cmac
-
 SOURCES += aes-cmac.cpp
 include(../examples.pri)
--- a/examples/base64test/base64test.pro
+++ b/examples/base64test/base64test.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
-TARGET = base64test
-
 SOURCES += base64test.cpp
 include(../examples.pri)
--- a/examples/certtest/certtest.pro
+++ b/examples/certtest/certtest.pro
@ -1,7 +1,2 @@
-TEMPLATE  = app
-CONFIG   += thread console
-TARGET    = certtest
-QT       -= gui
-
 SOURCES += certtest.cpp
 include(../examples.pri)
--- a/examples/ciphertest/ciphertest.pro
+++ b/examples/ciphertest/ciphertest.pro
@ -1,8 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-#debug
-QT -= gui
-TARGET = ciphertest
-
 SOURCES += ciphertest.cpp
 include(../examples.pri)
--- a/examples/cms/cms.pro
+++ b/examples/cms/cms.pro
@ -1,7 +1,2 @@
-TEMPLATE  = app
-CONFIG   += thread console
-TARGET    = cmsexample
-QT       -= gui
-
 SOURCES += cmsexample.cpp
 include(../examples.pri)
--- a/examples/eventhandlerdemo/eventhandlerdemo.pro
+++ b/examples/eventhandlerdemo/eventhandlerdemo.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
-TARGET = eventhandlerdemo
-
 SOURCES += eventhandlerdemo.cpp
 include(../examples.pri)
--- a/examples/examples.pri
+++ b/examples/examples.pri
@ -4,9 +4,13 @@

 include(../../confapp.pri)

+# default to console (individual programs can always override this if needed)
+CONFIG += console
+CONFIG -= app_bundle
+QT -= gui
+
 INCLUDEPATH += ../../include/QtCrypto
 LIBS += -L../../lib

 # link
 LIBS += -l$$QCA_LIBNAME
-
--- a/examples/hashtest/hashtest.pro
+++ b/examples/hashtest/hashtest.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
-TARGET = hashtest
-
 SOURCES += hashtest.cpp
 include(../examples.pri)
--- a/examples/hextest/hextest.pro
+++ b/examples/hextest/hextest.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
-TARGET = hextest
-
 SOURCES += hextest.cpp
 include(../examples.pri)
--- a/examples/keyloader/keyloader.pro
+++ b/examples/keyloader/keyloader.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += console
-QT -= gui
-TARGET = keyloader
-
 SOURCES += keyloader.cpp
 include(../examples.pri)
--- a/examples/mactest/mactest.pro
+++ b/examples/mactest/mactest.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
-TARGET = mactest
-
 SOURCES += mactest.cpp
 include(../examples.pri)
--- a/examples/md5crypt/md5crypt.pro
+++ b/examples/md5crypt/md5crypt.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
-TARGET = md5crypt
-
 SOURCES += md5crypt.cpp
 include(../examples.pri)
--- a/examples/providertest/providertest.pro
+++ b/examples/providertest/providertest.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-QT      -= gui
-TARGET = providertest
-
 SOURCES += providertest.cpp
 include(../examples.pri)
--- a/examples/publickeyexample/publickeyexample.pro
+++ b/examples/publickeyexample/publickeyexample.pro
@ -1,7 +1,2 @@
-TEMPLATE  = app
-CONFIG   += thread console
-TARGET    = publickeyexample
-QT       -= gui
-
 SOURCES += publickeyexample.cpp
 include(../examples.pri)
--- a/examples/randomtest/randomtest.pro
+++ b/examples/randomtest/randomtest.pro
@ -1,7 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
-TARGET = randomtest
-
 SOURCES += randomtest.cpp
 include(../examples.pri)
--- a/examples/rsatest/rsatest.pro
+++ b/examples/rsatest/rsatest.pro
@ -1,6 +1,2 @@
-TEMPLATE = app
-CONFIG += thread console
-TARGET = rsatest
-
 SOURCES += rsatest.cpp
 include(../examples.pri)
--- a/examples/saslservtest/saslservtest.pro
+++ b/examples/saslservtest/saslservtest.pro
@ -1,8 +1,4 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
 QT += network
-TARGET = saslservtest

 SOURCES += saslservtest.cpp
 include(../examples.pri)
--- a/examples/sasltest/sasltest.pro
+++ b/examples/sasltest/sasltest.pro
@ -1,8 +1,4 @@
-TEMPLATE = app
-CONFIG += thread console
-QT -= gui
 QT += network
-TARGET = sasltest

 SOURCES += sasltest.cpp
 include(../examples.pri)
--- a/examples/sslservtest/sslservtest.pro
+++ b/examples/sslservtest/sslservtest.pro
@ -1,8 +1,4 @@
-CONFIG  -= app_bundle
-CONFIG  += console
 QT += network

 SOURCES += sslservtest.cpp
 include(../examples.pri)
-
-
--- a/examples/ssltest/ssltest.pro
+++ b/examples/ssltest/ssltest.pro
@ -1,6 +1,3 @@
-CONFIG  -= app_bundle
-CONFIG  += console
-QT      -= gui
 QT += network

 SOURCES += ssltest.cpp
--- a/examples/tlssocket/tlssocket.pro
+++ b/examples/tlssocket/tlssocket.pro
@ -1,6 +1,3 @@
-CONFIG -= app_bundle
-CONFIG += console
-QT     -= gui
 QT += network

 HEADERS += tlssocket.h
--- a/unittest/base64unittest/base64unittest.pro
+++ b/unittest/base64unittest/base64unittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = base64unittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/bigintunittest/bigintunittest.pro
+++ b/unittest/bigintunittest/bigintunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = bigintunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/certunittest/certunittest.pro
+++ b/unittest/certunittest/certunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = certunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/cipherunittest/cipherunittest.pro
+++ b/unittest/cipherunittest/cipherunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = cipherunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/clientplugin/clientplugin.pro
+++ b/unittest/clientplugin/clientplugin.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = clientplugin
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/cms/cms.pro
+++ b/unittest/cms/cms.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = cms
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/dsaunittest/dsaunittest.pro
+++ b/unittest/dsaunittest/dsaunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = dsaunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/filewatchunittest/filewatchunittest.pro
+++ b/unittest/filewatchunittest/filewatchunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = filewatchunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/hashunittest/hashunittest.pro
+++ b/unittest/hashunittest/hashunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = hashunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/hexunittest/hexunittest.pro
+++ b/unittest/hexunittest/hexunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = hexunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/kdfunittest/kdfunittest.pro
+++ b/unittest/kdfunittest/kdfunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = kdfunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/keybundle/keybundle.pro
+++ b/unittest/keybundle/keybundle.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = keybundle
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/keygenunittest/keygenunittest.pro
+++ b/unittest/keygenunittest/keygenunittest.pro
@ -1,10 +1,8 @@
-TEMPLATE = app
-TARGET = keygenunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-# check target
+CONFIG += qtestlib

+# check target
 QMAKE_EXTRA_TARGETS = check
 check.depends = keygenunittest
 check.commands = ./keygenunittest
--- a/unittest/keylengthunittest/keylengthunittest.pro
+++ b/unittest/keylengthunittest/keylengthunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = keylengthunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/keystore/keystore.pro
+++ b/unittest/keystore/keystore.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = keystore
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/logger/logger.pro
+++ b/unittest/logger/logger.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = loggerunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/macunittest/macunittest.pro
+++ b/unittest/macunittest/macunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = macunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/pgpunittest/pgpunittest.pro
+++ b/unittest/pgpunittest/pgpunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = pgpunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/pkits/pkits.pro
+++ b/unittest/pkits/pkits.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = pkits
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/randomunittest/randomunittest.pro
+++ b/unittest/randomunittest/randomunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = randomunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/rsaunittest/rsaunittest.pro
+++ b/unittest/rsaunittest/rsaunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = rsaunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/securearrayunittest/securearrayunittest.pro
+++ b/unittest/securearrayunittest/securearrayunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = securearrayunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/staticunittest/staticunittest.pro
+++ b/unittest/staticunittest/staticunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = staticunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/symmetrickeyunittest/symmetrickeyunittest.pro
+++ b/unittest/symmetrickeyunittest/symmetrickeyunittest.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = symmetrickeyunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/tls/tls.pro
+++ b/unittest/tls/tls.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = tlsunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib

 # check target
 QMAKE_EXTRA_TARGETS = check
--- a/unittest/unittest.pri
+++ b/unittest/unittest.pri
@ -4,6 +4,11 @@

 include(../../confapp.pri)

+# default to console (individual programs can always override this if needed)
+CONFIG += console
+CONFIG -= app_bundle
+QT -= gui
+
 INCLUDEPATH += ../../include/QtCrypto
 LIBS += -L../../lib

--- a/unittest/velox/velox.pro
+++ b/unittest/velox/velox.pro
@ -1,9 +1,6 @@
-TEMPLATE = app
-TARGET = veloxunittest
 DEPENDPATH += .
 include(../unittest.pri)
-CONFIG += qtestlib thread console
-QT -= gui
+CONFIG += qtestlib
 QT += network

 # check target