From 3fdd36741b69a9dba1777871921f6d606c702a2e Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Wed, 7 Aug 2019 12:42:44 +0200 Subject: [PATCH 1/4] Debug Appveyor CI error --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 20261d2d0..44b1b623c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -137,6 +137,8 @@ before_package: # to run your custom scripts instead of automatic MSBuild build_script: - env + - find C:/msys64/mingw32/lib/ + - find C:/msys64/mingw32/bin/ - qmake -Wall -spec win32-g++ "CONFIG=debug" - mingw32-make -j3 From d4b60b6ad78b489827735242678fbea80bd7f3bb Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Wed, 7 Aug 2019 13:31:05 +0200 Subject: [PATCH 2/4] Workaround appveyor CI error by copyng Qt dll --- appveyor.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 44b1b623c..194628563 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -105,6 +105,16 @@ install: - copy C:\msys64\mingw64\x86_64-w64-mingw32\bin\ranlib.exe C:\msys64\mingw64\bin\x86_64-w64-mingw32-ranlib.exe - copy C:\msys64\mingw64\bin\windres.exe C:\msys64\mingw64\bin\x86_64-w64-mingw32-windres.exe + # Work-around linker looking for Qt dll in wrong place + - copy C:\msys64\mingw32\bin\Qt5UiTools.dll C:\msys64\mingw32\lib\Qt5UiTools.dll + - copy C:\msys64\mingw32\bin\Qt5PrintSupport.dll C:\msys64\mingw32\lib\Qt5PrintSupport.dll + - copy C:\msys64\mingw32\bin\Qt5Widgets.dll C:\msys64\mingw32\lib\Qt5Widgets.dll + - copy C:\msys64\mingw32\bin\Qt5Multimedia.dll C:\msys64\mingw32\lib\Qt5Multimedia.dll + - copy C:\msys64\mingw32\bin\Qt5Gui.dll C:\msys64\mingw32\lib\Qt5Gui.dll + - copy C:\msys64\mingw32\bin\Qt5Network.dll C:\msys64\mingw32\lib\Qt5Network.dll + - copy C:\msys64\mingw32\bin\Qt5Xml.dll C:\msys64\mingw32\lib\Qt5Xml.dll + - copy C:\msys64\mingw32\bin\Qt5Core.dll C:\msys64\mingw32\lib\Qt5Core.dll + #---------------------------------# # build configuration # @@ -137,8 +147,6 @@ before_package: # to run your custom scripts instead of automatic MSBuild build_script: - env - - find C:/msys64/mingw32/lib/ - - find C:/msys64/mingw32/bin/ - qmake -Wall -spec win32-g++ "CONFIG=debug" - mingw32-make -j3 From e6c3a6f732de88070c5ab6ef63eb8b6664e09c55 Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Wed, 7 Aug 2019 14:21:50 +0200 Subject: [PATCH 3/4] RetroShare-gui doesn't need to link to uitools --- retroshare-gui/src/retroshare-gui.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro index a40d29047..3ade727f2 100644 --- a/retroshare-gui/src/retroshare-gui.pro +++ b/retroshare-gui/src/retroshare-gui.pro @@ -53,7 +53,7 @@ HEADERS += TorControl/TorControlWindow.h greaterThan(QT_MAJOR_VERSION, 4) { # Qt 5 - QT += uitools widgets multimedia printsupport + QT += widgets multimedia printsupport linux-* { QT += x11extras } From 68aaf493def9341806b333298e7970bdf1e6d41b Mon Sep 17 00:00:00 2001 From: Gioacchino Mazzurco Date: Wed, 7 Aug 2019 14:22:29 +0200 Subject: [PATCH 4/4] Remove comping of uitools non existent dll --- appveyor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 194628563..2db935d50 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -106,7 +106,6 @@ install: - copy C:\msys64\mingw64\bin\windres.exe C:\msys64\mingw64\bin\x86_64-w64-mingw32-windres.exe # Work-around linker looking for Qt dll in wrong place - - copy C:\msys64\mingw32\bin\Qt5UiTools.dll C:\msys64\mingw32\lib\Qt5UiTools.dll - copy C:\msys64\mingw32\bin\Qt5PrintSupport.dll C:\msys64\mingw32\lib\Qt5PrintSupport.dll - copy C:\msys64\mingw32\bin\Qt5Widgets.dll C:\msys64\mingw32\lib\Qt5Widgets.dll - copy C:\msys64\mingw32\bin\Qt5Multimedia.dll C:\msys64\mingw32\lib\Qt5Multimedia.dll