diff options
| author | tezeb <tezeb+github@outoftheblue.pl> | 2017-03-12 14:03:20 +0100 |
|---|---|---|
| committer | tezeb <tezeb+github@outoftheblue.pl> | 2017-03-12 21:30:30 +0100 |
| commit | ed5cc364453a002812e32dea7c0f28fe4eb53085 (patch) | |
| tree | bfb0c318b0ce157ff467cca8946402058c991548 | |
| parent | 92201dcba871b43ce495798a7a580d97f60d162a (diff) | |
Workaround for failing test building for Windows
| -rw-r--r-- | .appveyor.yml | 5 | ||||
| -rw-r--r-- | tests/auto/util/util.pro | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 086f8175..f262442f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,14 +5,11 @@ install: build_script: - qmake qtpass.pro CONFIG+=static - mingw32-make + - mingw32-make check #after_build: - cmd: copy README.md src\release\README.txt - cmd: copy LICENSE src\release\LICENSE.txt - iscc qtpass.iss - - cmd: cd tests - - qmake - - mingw32-make - - mingw32-make check artifacts: - path: Output\qtpass-*.exe - path: src\release\qtpass.exe diff --git a/tests/auto/util/util.pro b/tests/auto/util/util.pro index 5a22d120..7e9c582a 100644 --- a/tests/auto/util/util.pro +++ b/tests/auto/util/util.pro @@ -1,5 +1,7 @@ !include(../auto.pri) { error("Couldn't find the auto.pri file!") } +message($$QMAKE_LINK_OBJECT_MAX) + SOURCES += tst_util.cpp \ OBJECTS += ../../../src/$(OBJECTS_DIR)/util.o \ @@ -27,4 +29,9 @@ INCLUDEPATH += ../../../src win32 { LIBS += -lbcrypt + RC_FILE = ../../../windows.rc +# temporary workaround for QTBUG-6453 + QMAKE_LINK_OBJECT_MAX=24 +# setting this may also work, but I can't find appropriate value right now +# QMAKE_LINK_OBJECT_SCRIPT = } |