8348648c56
Make c'tor of InternalError inline again to workaround linker errors
...
Otherwise the shared build with targeting x86_64-w64-mingw32 fails with:
```
FAILED: widgets/syncthingwidgets-qt6.dll widgets/libsyncthingwidgets-qt6.dll.a
: && /usr/lib/ccache/bin/x86_64-w64-mingw32-g++ -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS -D_FORTIFY_SOURCE=2 -D_GLIBCXX_ASSERTIONS -O2 -pipe -fno-plt -fexceptions --param=ssp-buffer-size=4 -Wformat -Werror=format-security -fcf-protection -O3 -DNDEBUG -Wl,-O1,--sort-common,--as-needed -fstack-protector -shared -o widgets/syncthingwidgets-qt6.dll -Wl,--out-implib,widgets/libsyncthingwidgets-qt6.dll.a -Wl,--major-image-version,1,--minor-image-version,1 widgets/CMakeFiles/syncthingwidgets-qt6.dir/syncthingwidgets-qt6_autogen/mocs_compilation.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/settings/settings.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/settings/settingsdialog.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/webview/webpage.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/webview/webviewdialog.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/webview/webviewinterceptor.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/textviewdialog.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/internalerrorsdialog.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/direrrorsdialog.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/statusinfo.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/dbusstatusnotifier.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/internalerror.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/otherdialogs.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/syncthinglauncher.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/syncthingkiller.cpp.obj widgets/CMakeFiles/syncthingwidgets-qt6.dir/resources/windows-Release.rc.res widgets/CMakeFiles/syncthingwidgets-qt6.dir/syncthingwidgets-qt6_autogen/3YJK5W5UP7/qrc_syncthingwidgetsicons.cpp.obj -L/build/mingw-w64-syncthingtray-qt6/src/syncthingtray/build-x86_64-w64-mingw32-shared/connector -L/build/mingw-w64-syncthingtray-qt6/src/syncthingtray/build-x86_64-w64-mingw32-shared/model -L/build/mingw-w64-syncthingtray-qt6/src/lib model/libsyncthingmodel-qt6.dll.a /usr/x86_64-w64-mingw32/lib/libqtutilities-qt6.dll.a libsyncthing/libsyncthing-qt6.dll.a /usr/x86_64-w64-mingw32/lib/libQt6Network.dll.a /usr/x86_64-w64-mingw32/lib/libQt6Concurrent.dll.a connector/libsyncthingconnector-qt6.dll.a /usr/x86_64-w64-mingw32/lib/libc++utilities.dll.a /usr/x86_64-w64-mingw32/lib/libQt6Network.dll.a /usr/x86_64-w64-mingw32/lib/libQt6Core.dll.a /usr/x86_64-w64-mingw32/lib/libqtforkawesome-qt6.dll.a /usr/x86_64-w64-mingw32/lib/libQt6Widgets.dll.a /usr/x86_64-w64-mingw32/lib/libQt6Gui.dll.a /usr/x86_64-w64-mingw32/lib/libQt6Core.dll.a /usr/x86_64-w64-mingw32/lib/libc++utilities.dll.a /usr/x86_64-w64-mingw32/lib/libQt6Widgets.dll.a /usr/x86_64-w64-mingw32/lib/libQt6Gui.dll.a -ld3d11 -ldxgi -ldxguid -lws2_32 /usr/x86_64-w64-mingw32/lib/libQt6Core.dll.a -lmpr -luserenv -lkernel32 -luser32 -lgdi32 -lwinspool -lshell32 -lole32 -loleaut32 -luuid -lcomdlg32 -ladvapi32 && :
/usr/lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../x86_64-w64-mingw32/bin/ld: widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/internalerror.cpp.obj:internalerror.cpp:(.text+0x1a0): multiple definition of `QtGui::InternalError::InternalError(QString const&, QUrl const&, QByteArray const&)'; widgets/CMakeFiles/syncthingwidgets-qt6.dir/syncthingwidgets-qt6_autogen/mocs_compilation.cpp.obj:mocs_compilation.cpp:(.text$_ZN5QtGui13InternalErrorC2ERK7QStringRK4QUrlRK10QByteArray[_ZN5QtGui13InternalErrorC2ERK7QStringRK4QUrlRK10QByteArray]+0x0): first defined here
/usr/lib/gcc/x86_64-w64-mingw32/11.2.0/../../../../x86_64-w64-mingw32/bin/ld: widgets/CMakeFiles/syncthingwidgets-qt6.dir/misc/internalerror.cpp.obj:internalerror.cpp:(.text+0x1a0): multiple definition of `QtGui::InternalError::InternalError(QString const&, QUrl const&, QByteArray const&)'; widgets/CMakeFiles/syncthingwidgets-qt6.dir/syncthingwidgets-qt6_autogen/mocs_compilation.cpp.obj:mocs_compilation.cpp:(.text$_ZN5QtGui13InternalErrorC1ERK7QStringRK4QUrlRK10QByteArray[_ZN5QtGui13InternalErrorC1ERK7QStringRK4QUrlRK10QByteArray]+0x0): first defined here
```
I can currently not make sense of this build error. It does not happen
when targeting Linux or i686.
2021-10-05 00:13:34 +02:00
4301910f1d
Avoid QMessageBox::warning() overload deprecated by Qt 6.2.0
2021-10-04 19:31:50 +02:00
567e176d48
Link libsyncthing to pthread library via -pthread
...
That's preferred over just specifying the library path because it invokes
additional behavior like adding `-D_REENTRANT` which might be required.
2021-10-04 19:21:18 +02:00
55e59d20c0
Make c'tor of InternalError explicit
2021-10-04 19:17:33 +02:00
5e50d25c32
Improve build instructions
...
* Remove `-DBUNDLED_QT_FORK_AWESOME_PATH=…` which is now covered by the
subdirs project
* Add link to "Providing the font file" section
2021-10-03 23:17:31 +02:00
52217814f1
Apply cmake-format
2021-10-03 23:07:12 +02:00
8261a161ab
Set default re-connect interval back to 30 seconds
...
See https://github.com/Martchus/syncthingtray/issues/16#issuecomment-932986686
2021-10-03 23:05:49 +02:00
98c911b2f8
Merge pull request #113 from hrittich/upstream-patches
...
Allow finding of packages in namespaces
2021-10-03 19:55:55 +02:00
Hannah Rittich
2968898195
Allow finding of packages in namespaces
2021-10-03 02:07:18 +02:00
4517ea41b6
Update translations
2021-10-02 20:31:56 +02:00
745082f357
Redact password from URL when displaying internal errors
2021-10-02 20:31:20 +02:00
239d751342
Avoid an unhandled exception when local setup is incorrect
...
Apparently Boost.Process relies on the setup to be correct so the
configured locale actually needs to be available.
2021-09-30 23:41:27 +02:00
b0a17cc540
Merge pull request #112 from tomasz1986/tomasz86-classic2000
...
Add link to Classic 2000 custom high contrast Windows themes
2021-09-25 19:13:34 +02:00
Tomasz Wilczyński
093f42cb38
Add link to Classic 2000 custom high contrast Windows themes
...
Signed-off-by: Tomasz Wilczyński <twilczynski@naver.com>
2021-09-26 01:22:20 +09:00
e73350c982
Mention "High contrast" option in dark mode workaround
2021-09-17 22:39:13 +02:00
44d69cd3bf
Remove the dark stylesheet as it is not working well and a different palette is enough
2021-09-17 22:23:29 +02:00
dde61bb783
Document workaround for missing support for Windows 10 dark mode
2021-09-17 22:22:32 +02:00
920bf11269
Move platform-specific workarounds to "Known bugs"
2021-09-17 22:21:14 +02:00
a581180924
Add reference to QTBUG-72028
2021-09-17 00:21:33 +02:00
da470c4ddc
Ignore Plasma deprecation warnings to still be able to treat warnings as errors
...
Not sure how to fix the errors because Plasma's own applets haven't been
ported yet.
2021-09-16 22:58:52 +02:00
b7a8a73f2a
Import static icon engine plugin
2021-09-16 21:33:46 +02:00
a8c22e4168
Remove no longer used "view-barcode" icon
2021-09-15 20:38:21 +02:00
f384d2a496
Use "qrcode" icon from ForkAwesome
...
It fits better than "view-barcode" from the icon theme. This also tests
using ForkAwesome icons via the custom icon engine. Unfortunately this
does not seem to work within the Plasmoid so far.
2021-09-15 20:37:21 +02:00
1d239cca51
Avoid multiple definitions error when building models as static lib itself
2021-09-11 21:37:43 +02:00
04a57c7e9f
Fix ForkAwesome icons in plasmoid
2021-09-11 20:39:37 +02:00
68bc50d46c
Ensure resource for font file of static qtfontawesome is not dropped
2021-09-11 20:02:05 +02:00
f5c6444b4c
Improve code for bundling qtforkawesome
2021-09-11 19:18:34 +02:00
66448a0774
Adapt to changes in qtforkawesome
2021-09-11 16:45:09 +02:00
43fcb9f71b
Migrate to ForkAwesome
...
* FontAwesome uses a propritary build system so let's move to its fork
ForkAwesome similar to Syncthing
* See https://github.com/syncthing/syncthing/pull/5237
* Bundle the font file instead of having the SVGs directly within
Syncthing Tray's own repository
2021-09-11 02:20:38 +02:00
ac6ee45017
Update libsyncthing to v1.18.2
2021-09-07 14:46:16 +02:00
8d6a9a042e
Adapt config parser tests to changed GUI address
2021-08-25 21:48:33 +02:00
b828d7c274
Fix launching Syncthing with program/args containing non-ASCII characters
...
* Pass program/args for Syncthing launcher using UTF-16 under Windows
* See https://github.com/Martchus/syncthingtray/issues/107
2021-08-25 00:15:00 +02:00
6aac7b0eae
Suppress console Window under Windows
...
See https://github.com/Martchus/syncthingtray/issues/108
2021-08-24 23:50:28 +02:00
7cf56732bd
Remove -no-console from default args on non-Windows platforms
...
* According to https://docs.syncthing.net/users/syncthing.html this flag is
Windows-only.
* See https://github.com/Martchus/syncthingtray/issues/106
2021-08-20 14:16:48 +02:00
7e7eab9eb8
Hardcode 127.0.0.1 in test setup instead of relying on DNS resolution of localhost
...
This should not be necessary but apparently helps with test failures
reported in https://github.com/Martchus/syncthingtray/issues/105 .
2021-08-09 13:05:12 +02:00
09e8955c06
Remove const_cast workaround for dealing with certificate errors
2021-08-07 19:42:15 +02:00
078145f354
Require qtutilities 6.5.0 for change to webviewincludes.h
2021-08-07 18:43:32 +02:00
d21c7cdf2a
Port Qt WebEngine related features to Qt 6.2.0 (beta2)
2021-08-07 18:05:30 +02:00
f2db5e737c
Fix typo in logging of tests
2021-08-07 16:03:57 +02:00
2152ae8a30
Merge pull request #104 from yejingchen/patch-1
...
Fix cmakelists to find correct qtutilities name
2021-08-06 11:46:20 +02:00
yejingchen
8e1385bd2e
Fix cmakelists to find correct qtutilities name
...
Hit this when building syncthingtray-qt6 1.1.9 from AUR. Cmake chose to find qtutilities instead of qtutilities-qt6 and failed to build.
2021-08-06 10:44:00 +08:00
a1d78a2f30
Update translations
2021-08-03 14:09:02 +02:00
a1fddfcb07
Apply clang-format/cmake-format
2021-08-03 14:06:17 +02:00
f55814d6e5
Update libsyncthing to v1.18.1
2021-08-03 14:02:18 +02:00
fb09378935
Ensure files for mocked configuration are found when testing plasmoid
2021-08-02 23:38:58 +02:00
95800eb1ca
Fix setting folder icon in plasmoid's downloads page
2021-08-02 23:38:18 +02:00
39497227fa
Fix section headings of contributing and nested sections
2021-08-02 19:58:30 +02:00
d12061184b
Improve wording in build instructions
2021-08-02 19:52:21 +02:00
61c79352a4
Remove obsolete note about Qt WebEngine
2021-08-02 19:49:35 +02:00
dfbf6e7ce9
Improve build instructions to deal with symlinks under Windows
2021-07-25 17:25:30 +02:00
