Commit Graph

51 Commits

Author SHA1 Message Date
Barath Kannan
ca9ff199d6 append hyphen to qt5 module names 2018-01-18 10:02:56 +11:00
Barath Kannan
fe94a33bfe qt5 network auth module 2017-12-31 08:25:28 +11:00
Barath Kannan
d8f0ea9999 resolve merge conflicts 2017-12-27 16:57:43 +11:00
Robert Schumacher
db40d19f3d [qt5] Add atlmfc to dependencies on windows due to tlbase.h inclusion. Fixes #2344. 2017-12-21 12:02:08 -08:00
Barath Kannan
22e9a2b25d change serial module name 2017-12-15 07:15:38 +11:00
Robert Schumacher
eec26f68fc [qt5] Reduce duplication in modular build by extracting qt5modularscripts 2017-11-20 17:07:03 -08:00
Barath Kannan
890a81bebc remove old qt5 2017-10-16 00:41:48 +11:00
ShinNoNoir
6d98ee5d9c [qt5] Bump version to reflect fixcmake.py fix 2017-09-19 17:25:06 +02:00
ShinNoNoir
956ced64d3 [qt5] Update fixcmake.py for new manual-link directory 2017-09-19 17:24:06 +02:00
Raynor Vliegendhart
304a1561cb [qt5] Bump version to reflect change in which .libs are linked 2017-09-06 08:03:45 +02:00
Raynor Vliegendhart
cd8c8af8e8 [qt5] Do not link all .lib files
This commit moves a few .lib files to subfolders to prevent them from
automatically getting linked:

Qt5Bootstrap (dbg):
This lib is linked against a release version of the CRT and is only
meant for release builds. For debug builds, this lib should not be
linked at all.

qtmain (rel), qtmaind (dbg),
Qt5AxServer (rel), Qt5AxServerd (dbg):
These libs are mutually exclusive. The user either links against
qtmain(d) for desktop applications or against Qt5AxServer(d) for ActiveX
servers.

See https://github.com/Microsoft/vcpkg/issues/1442 for more information.
2017-09-06 07:54:32 +02:00
Robert Schumacher
17cb5b9c34 [qt5] Bump version to include tool dependency copying. 2017-08-04 14:38:56 -07:00
Mikhail Paulyshka
04af706671 [qt5] copy tools dependencies 2017-08-03 10:09:35 +03:00
Robert Schumacher
b33632943c [qt5] Fastfail static builds 2017-07-03 19:08:24 -07:00
Robert Schumacher
576044e612 Merge pull request #1218 from bagong/qt5-private-headers
Qt5: Add private header paths in cmake config files via patch
2017-06-06 15:01:39 -07:00
Robert Schumacher
7b4d83c444 [qt5] Add check for long path. 2017-06-06 11:39:00 -07:00
Bagong
3f2f920a96 Add private header paths in cmake config files via patch 2017-06-05 11:34:31 +02:00
Robert Schumacher
faaa71baa0 [qt5] Use _CL_ to add /utf-8 to all compiler lines.
Fixes #1092.
Fixes #1037.
Fixes #1024.
2017-05-15 20:14:21 -07:00
Robert Schumacher
50af29ade6 [qt5] Restore trailing spaces to uncorrupt patches. 2017-04-28 01:35:31 -07:00
Tobias Kohlbau
5a32a97de1 [qt5] bumped to qt5.8
Signed-off-by: Tobias Kohlbau <tobias@kohlbau.de>
2017-04-27 15:39:59 +02:00
Robert Schumacher
558d54dd4e [qt5] Add qtdeploy.ps1 to enhance applocal.ps1 when Qt is in use. 2017-03-31 06:35:23 -07:00
Steffen André Langnes
a81ac6282e [qt5] Configure without -no-style-* parameters
Removed the parameters for Windows styles because they prevent proper style rendering (defaults to Windows 9x style).

Removed the parameter for the fusion style for consistency.
2017-03-29 22:57:43 +02:00
Robert Schumacher
f17fd50a62 [qt5] Enable opengl desktop to support QWT 2017-03-20 16:20:02 -07:00
Robert Schumacher
e3d9627757 [qt5] Fix regression from dd6d1aa5. When building a static triplet, repeat the build on failure. 2017-03-06 17:52:25 -08:00
Robert Schumacher
df4d385d3d [qt5] Further reduce regressions.
Fix issue where generated cmake points at the wrong tools folder.
2017-02-24 16:00:05 -08:00
Robert Schumacher
e4ff363f5c [qt5] Reduce number of skipped components. 2017-02-23 19:01:01 -08:00
Robert Schumacher
dd6d1aa560 [qt5] Exercise full control over build configuration.
Bumps version to 5.7.1-2

This fixes several issues:
- Prevents a hang for user input during the build.
- Moves the tools into a subdirectory so their DLLs do not interfere with other packages.
- Adds the currently installed DLLs to the path so that tools compiled during the build can be run.
- Uses our system's copy of double-conversion.
- No longer uses looped builds; I haven't seen issues since the update to JOM 1.1.2
- Works around an issue with Qt5Bootstrap (QTBUG-55499)

Regressions to fix:
- Disables many subcomponents
2017-02-23 03:34:21 -08:00
Robert Schumacher
116b1b8c66 Reorder path alterations to generally append instead of prepend.
This solves the issue where some software bundles (git) provide multiple executables in the same folder, which can override other desired programs (link.exe).
2017-02-08 17:39:31 -08:00
Silvio Traversaro
fc8228a79b [qt5] Fix tabs/spaces mismatch 2017-01-06 23:04:20 +01:00
Silvio Traversaro
95ff552b85 [qt5] Avoid printing warnings for problems in applying"confguration patches"
The `QUIET` option for `vcpkg_apply_patches` was added in f4c34bb42d . 
Fixes https://github.com/Microsoft/vcpkg/issues/411 .
2017-01-06 23:02:19 +01:00
Silvio Traversaro
614320e007 [qt5] Bump version 2016-12-29 10:59:48 +01:00
Silvio Traversaro
6741f959bb [qt5] Turn -no-pcre -qt-pcre
Despite Qt documentation ( http://doc.qt.io/qt-5/configure-options.html ) `-no-pcre` is not recognized as an option, while `-qt-pcre` is recognized as an option.
2016-12-29 10:59:02 +01:00
Alexander Karatarakis
2d9f8ff115 [qt5] Bump version 2016-12-27 14:23:20 -08:00
Silvio Traversaro
1cc6a9c4ce [qt5] Explicitly avoid compiling qt dependencies that could be available in vcpkg
To avoid problems such as the one described in https://github.com/Microsoft/vcpkg/issues/412 . 
If a particular dependency is actually needed, it can be added `-qt-<dep>` or `-system-<dep> to use the vcpkg version, see https://github.com/Microsoft/vcpkg/issues/455 .
2016-12-24 15:26:58 +01:00
Charlie Barto
e88b9c9160 bump qt5 version 2016-12-21 14:56:51 -05:00
Charlie Barto
a82d7a4405 work on qt5 5.7.1 2016-12-20 20:37:16 -05:00
charlie barto
67303f1569 Added libpq support to qt5
qt5 changes

more qt5 changes

added libpq to qt5

fix merge

fixed left over git thing
2016-12-02 12:19:18 -05:00
sdcb
daa8382208 Fix the xinputgamepad.dll directory issue. 2016-11-14 17:39:22 +08:00
sdcb
202c113a7c Fix xinputgamepadd.dll directory issue. 2016-11-14 17:37:16 +08:00
sdcb
6e30c933f1 [qt5] remove the empty plugins/gamepads folder (which caused a installation failure). 2016-11-10 11:13:56 +08:00
Robert Schumacher
bdcdb4408d [qt5] Version bump for plugin changes 2016-11-09 15:21:52 -08:00
Barath Kannan
15f3aa7ce6 plugin fixes 2016-11-08 22:16:13 +11:00
Robert Schumacher
5e058c2192 [qt5] Don't copy PDBs for tools. Skip plugins directory (it's empty?). 2016-11-07 21:35:08 -08:00
Charles Barto
b25c13c155 made some qt5 fixes 2016-11-01 19:19:05 -04:00
Barath Kannan
a79c348045 fixes for plugin installation, cmake package files 2016-10-30 13:45:09 +11:00
Barath Kannan
9467c1bd81 jom the install, dynamic linkage means tools need the dlls 2016-10-26 12:30:58 +11:00
Barath Kannan
ab4aa274c1 virtual keyboard directory isn't created in static builds, no rename required 2016-10-25 22:27:51 +11:00
Barath Kannan
162ba52f43 need a function to repeatedly build up to a number of failures, since qt builds are so flaky 2016-10-25 20:56:02 +11:00
Barath Kannan
7e19b17a07 static installation fixes 2016-10-25 16:14:21 +11:00
Barath Kannan
8dbeacd5ad static linkage and jom fixes 2016-10-25 12:39:50 +11:00