1
0
Fork 0
Commit graph

118 commits

Author SHA1 Message Date
Ilya Fedin
34a8698fcc Revert "Use QtWidgets private include directories with Qt 5"
This reverts commit f552ccb6e5.
2022-06-03 20:01:52 +04:00
Ilya Fedin
1be19c32de Get xdgdesktopportal back 2022-05-31 11:57:47 +04:00
Ilya Fedin
941f8fcc4e Link Qt 6 resources without hardcoding the build type 2022-04-19 07:00:30 +04:00
Ilya Fedin
ed1411f129 Update for Qt 6.3 2022-04-13 15:04:55 +04:00
Ilya Fedin
b30865ced9 Restore original xdg-shell linking 2022-04-11 09:45:51 +04:00
John Preston
9a043ab5ad Update Qt version to 6.2.4 on macOS and Linux. 2022-03-28 01:26:56 +04:00
Ilya Fedin
77f023b65d Ensure libjpeg is linked in the right order 2022-03-21 16:45:55 +04:00
John Preston
3aa9ec0ed1 Move Qt 5 version to 5.15.3 open source. 2022-03-08 22:24:05 +04:00
John Preston
aa71b768bd Update Qt to 6.2.3 on macOS and Linux. 2022-03-05 17:02:35 +04:00
Ilya Fedin
54e750cca0 Restore TARGET_FILE usage for external libraries 2022-02-05 23:00:53 +03:00
John Preston
6d81711cf8 Fix build on Linux. 2022-02-03 11:46:16 +03:00
Ilya Fedin
f552ccb6e5 Use QtWidgets private include directories with Qt 5 2022-02-02 09:21:10 +03:00
Ilya Fedin
985f43a162 Use linux linking helpers without LINK_ONLY 2022-02-01 14:38:31 +03:00
Ilya Fedin
df426419c7 Use LINK_ONLY instead of TARGET_FILE 2022-01-28 23:29:00 +04:00
Ilya Fedin
e617e4ba43 QtDBus is used only by fcitx plugins now 2022-01-23 13:52:45 +04:00
Ilya Fedin
b6515c543a Use return to decrease indentation in cmake files 2022-01-12 19:11:14 +03:00
Ilya Fedin
289a002b6d Use IMPORTED_LOCATION for zlib 2022-01-12 19:11:14 +03:00
Ilya Fedin
7d1ad3dfe3 Add missed dependency on external_openssl target for Qt 2022-01-12 19:11:14 +03:00
Ilya Fedin
10108ea237 Move libdl/libpthread handling to common_options
Setting -pthread makes linking libatomic manually unneeded
2022-01-05 12:54:40 +03:00
Ilya Fedin
e4acb81f08 Add mkspecs include directory for Windows & macOS 2021-12-22 13:48:57 +04:00
John Preston
2d6e661799 Migrate to Qt 6.2.2. 2021-12-21 15:36:44 +00:00
Ilya Fedin
c2b070275e Remove gtk and glib helpers
They're Qt patches now
2021-11-30 17:42:31 +04:00
John Preston
393ae95d7f Add network reachability plugin on macOS. 2021-11-02 11:16:44 +04:00
Ilya Fedin
d5237e224e Make -Wl,-z,now work on older systems 2021-11-02 09:42:00 +04:00
Ilya Fedin
68251bb2f0 Re-enable fcitx-qt5 with Qt 6 2021-10-27 22:01:42 +04:00
Ilya Fedin
5ff43f9c51 Enable HIME with Qt 6 2021-10-24 13:58:26 +04:00
John Preston
57ccb6c03c Fix build with Qt 6.2 on macOS. 2021-10-21 19:45:43 +04:00
Ilya Fedin
02993a6c82 Add missed LINUX condition 2021-10-21 16:59:29 +04:00
Ilya Fedin
8540bd0b60 Fix static build without Wayland 2021-10-21 10:47:24 +04:00
Ilya Fedin
993e1e052e Add OpenSSL plugin to Qt 6 build 2021-10-21 10:19:55 +04:00
Ilya Fedin
a8856aa831 Add Qt 6 support
Tested on Linux only
2021-10-21 08:44:20 +04:00
Ilya Fedin
c4e45be16c Don't link deprecated wl-shell 2021-10-19 17:20:55 +04:00
Ilya Fedin
9adb6a5efc fcitx5_qt5 -> fcitx5_qt 2021-10-19 17:20:55 +04:00
Ilya Fedin
1dacc0ac4f QGenericEnginePlugin is available everywhere
So link it everywhere
2021-09-25 15:24:38 +04:00
Ilya Fedin
d3e1827ff0 Don't link hime-im-client, use it with dlopen instead 2021-09-12 00:02:59 +03:00
Ilya Fedin
aa5afd0a41 Add glib helper to make it optional for Qt 2021-09-12 00:02:59 +03:00
Ilya Fedin
750861b4ab Link drm & zlib statically like before, make GL optional 2021-09-09 16:52:52 +03:00
John Preston
f343a1634c Use macOS libs from Libraries/local. 2021-09-07 23:39:38 +03:00
Ilya Fedin
95ee188c7b Get rid of GTK integration 2021-09-05 17:37:54 +03:00
John Preston
7260711ec5 Add QtSvg include path and preprocessor definition. 2021-08-11 20:16:08 +03:00
John Preston
605de3adc8 Add QtSvg to packaged Qt dependencies. 2021-08-11 20:09:35 +03:00
John Preston
fb595431a9 Link Qt5Svg for wallpaper patterns. 2021-08-11 18:24:28 +03:00
Ilya Fedin
b02fc90612 Get rid of osx and linux32 special targets 2021-08-11 16:01:08 +03:00
Ilya Fedin
3fbee998ae Move flags non-qt-related flags from external_qt to common_options 2021-08-08 09:26:18 +03:00
Ilya Fedin
66cca9be57 Add SYSTEM flag to target_include_directories where appropriate 2021-07-19 19:01:08 +03:00
John Preston
8432257651 Use default Qt-{version} folder on Windows. 2021-07-01 23:44:36 +03:00
John Preston
e2455f3194 Add dynamic DirectX loading helper. 2021-07-01 23:44:35 +03:00
John Preston
fc4d02573c Link Qt with statically built ANGLE. 2021-07-01 23:44:35 +03:00
Ilya Fedin
cb92f08d51 Enable Qt's gtk integration 2021-07-01 21:02:04 +03:00
Ilya Fedin
4a63a30c17 Get rid of unneeded glibc wraps 2021-06-29 17:02:16 +03:00