qca: improve tests

src/qca-test.pro

@@ -1,13 +1,11 @@
 # This file is part of MXE. See LICENSE.md for licensing information.
 
 TEMPLATE = app
-greaterThan(QT_MAJOR_VERSION, 4): TARGET = test-qca5-qmake
-else: TARGET = test-qca-qmake
+TARGET = test-qca-qmake
 SOURCES += qca-test.cpp
 CONFIG += crypto console
 QMAKE_CXXFLAGS += -Wall -Werror
 
 # For static linking:
-# QTPLUGIN += qca-gnupg qca-logger qca-ossl qca-softstore qca-qt5
-# LIBS += -L$$[QT_INSTALL_PLUGINS]/crypto
+LIBS += -L$$[QT_INSTALL_PLUGINS]/crypto -lqca-ossl
 

src/qca.mk

@@ -21,17 +21,17 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
     # build test as qmake project
-    $(if $(BUILD_SHARED), \
-        mkdir '$(BUILD_DIR)/test-qca'
-        cd '$(BUILD_DIR)/test-qca' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro'
-        $(MAKE) -C '$(BUILD_DIR)/test-qca' -j $(JOBS) $(BUILD_TYPE)
-        $(INSTALL) -m755 '$(BUILD_DIR)/test-qca/$(BUILD_TYPE)/test-qca5-qmake.exe' '$(PREFIX)/$(TARGET)/bin/')
+    mkdir '$(BUILD_DIR)/test-qca'
+    cd '$(BUILD_DIR)/test-qca' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro'
+    $(MAKE) -C '$(BUILD_DIR)/test-qca' -j $(JOBS) $(BUILD_TYPE)
+    $(INSTALL) -m755 '$(BUILD_DIR)/test-qca/$(BUILD_TYPE)/test-qca-qmake.exe' '$(PREFIX)/$(TARGET)/bin/'
 
     # build test manually
     '$(TARGET)-g++' \
-        -W -Wall -Werror -std=gnu++11  \
+        -W -Wall -Werror -std=gnu++11 \
         '$(PWD)/src/qca-test.cpp' \
         -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
+        $(if $(BUILD_STATIC), -L'$(PREFIX)/$(TARGET)/qt5/plugins/crypto' -lqca-ossl) \
         `'$(TARGET)-pkg-config' qca2-qt5 --cflags --libs`
 endef