Commit Graph

362 Commits

Author SHA1 Message Date
Bjørn Forsman 6916f24e84 treewide: enableParallelBuild -> enableParallelBuilding 2017-06-24 22:22:48 +02:00
Thomas Tuegel 22b10bac78 qt5: 5.8.0 -> 5.9.0
Qt 5.8 is immediately removed because its support window is ended.

The qtlocation module is built with `enableParallelBuilding = false` so that the
clipper library will be built before the components which link to it.

kjs now depends directly on pcre. The dependency was previously propagated from
qtbase, which now depends on pcre2.
2017-06-24 07:43:57 -05:00
Thomas Tuegel e6cf9b9df0 qt56: determine plugin and import paths from PATH
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further modification.
2017-06-18 08:44:47 -05:00
Thomas Tuegel dab7700f6c qt58: determine plugin and import paths from PATH
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further
modification.
2017-06-18 08:44:47 -05:00
Thomas Tuegel 99ed5853eb qt56.qtserialport: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:47 -05:00
Thomas Tuegel 8cc09c9e3e qt56.qtwebkit: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:47 -05:00
Thomas Tuegel c546c26e3a qt58.qtwebkit: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel b1dcd271d1 qt58.qtserialport: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel f392614251 qt58.qtbase: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel 7dc961b310 qttools: move runtime tools in postFixup 2017-06-18 08:44:43 -05:00
Thomas Tuegel dea7372ebf qtbase: fix plugin path in CMake modules 2017-06-18 08:44:43 -05:00
Thomas Tuegel d9f29afa64 qt5: use one output by default 2017-06-18 08:44:43 -05:00
Thomas Tuegel 6fa41788be qt5: separate plugins from libraries 2017-06-18 08:44:42 -05:00
Thomas Tuegel 5a8295e596 qtbase: setup required environment in GTK3 platform theme plugin 2017-06-18 08:44:42 -05:00
Thomas Tuegel c816bbc8a8 qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Thomas Tuegel 1607f51613 qmake: unify Darwin and Linux setup hooks 2017-06-18 08:43:39 -05:00
Thomas Tuegel 7b6f8dc77f qt5: move kdeDerivation to qt5.mkDerivation 2017-06-18 08:42:19 -05:00
Thomas Tuegel 210f688802 qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Thomas Tuegel 3f3d33a078 qt5: use distinct lib/qt-5.x prefix for each minor version
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
2017-06-18 08:41:57 -05:00
Vladimír Čunát 515414ed32 Merge branch 'master' into staging 2017-05-16 18:32:43 +02:00
Vladimír Čunát f5c568446a qtwebkit-*: fix #25585: bad RPATH entries 2017-05-16 18:30:58 +02:00
Thomas Tuegel fabd48272f Merge branch 'qt--qpa-plugin-path' 2017-05-14 13:55:42 -05:00
Thomas Tuegel 7c338b7df8 qtbase: search platform plugin paths before other plugin paths 2017-05-14 13:55:03 -05:00
Thomas Tuegel 88a5082edf Revert "qt58: ignore NIX_PROFILES environment variable"
This reverts commit 6169bd98f5.
2017-05-14 13:55:02 -05:00
Periklis Tsirakidis 096c008036 Fix #25723: Remove old GNU libstdc++ for qtbase 2017-05-14 09:46:38 +02:00
Thomas Tuegel 2716e5bd80 qt58.qtbase: cleanup: sort attributes 2017-04-28 05:54:29 -05:00
Thomas Tuegel 9f00e2be18 qt58.qtbase: fix warnings in TZDIR patch 2017-04-28 05:54:28 -05:00
Thomas Tuegel 64418af8c5 qt58.qtbase: fix developer build 2017-04-28 05:54:22 -05:00
Thomas Tuegel 52ac15953e makeQtWrapper: prefix Qt search paths 2017-04-28 05:54:21 -05:00
Thomas Tuegel 577c4f543b qt58.qtbase: remove D-Bus library paths patch
Qt is configured with `-dbus-linked` which causes the library paths to be
resolved at compile time and added to RPATH.
2017-04-28 05:54:19 -05:00
Thomas Tuegel 5735edb894 qt58.qtbase: remove OpenSSL library paths patch
Qt is configure with `-openssl-linked` which causes the library paths to be
resolved at build time and added to RPATH.
2017-04-28 05:54:19 -05:00
Thomas Tuegel 0d0858202c qtbase: unify Linux and Darwin patchsets 2017-04-28 05:54:17 -05:00
Thomas Tuegel 4bd911dcd6 qtbase: fill in configure flags 2017-04-28 05:54:17 -05:00
Thomas Tuegel 3062080572 qt58.qtbase: remove SSL decryption patch
This option does not require a patch; it can be enabled through
NIX_CFLAGS_COMPILE.
2017-04-28 05:54:16 -05:00
Thomas Tuegel a579e0129c qt58.qtbase: clean up configuration 2017-04-28 05:54:16 -05:00
Thomas Tuegel e4fb41cc5b qt58.qtbase: clean up CMake path sed scripts 2017-04-28 05:54:15 -05:00
Thomas Tuegel 9d9ab3de98 qt58.qtbase: replace mkspecs patch with sed script 2017-04-28 05:49:35 -05:00
Thomas Tuegel 1f62bf01d3 qt58.qtbase: Fix path to fallback libGL 2017-04-28 05:49:35 -05:00
Thomas Tuegel 8e2b6a90c0 qt58.qtbase: Fix path to libdbus 2017-04-28 05:49:35 -05:00
Thomas Tuegel f45f2635e1 qt58.qtbase: Fix path to libssl and libcrypto 2017-04-28 05:49:34 -05:00
Thomas Tuegel ff8fa7e397 qt58.qtbase: Fix path to libXcursor 2017-04-28 05:49:34 -05:00
Thomas Tuegel 40aa757898 qt58.qtbase: Fix path to libresolv 2017-04-28 05:49:34 -05:00
Thomas Tuegel 6169bd98f5 qt58: ignore NIX_PROFILES environment variable 2017-04-28 05:49:34 -05:00
Thomas Tuegel 12c981d4b7 qt58.qtbase: Fix QTCOMPOSE search patch 2017-04-28 05:49:34 -05:00
Thomas Tuegel 2ce3fe0a71 qt58.qtbase: Fix QT_QPA_PLATFORM_PLUGIN_PATH
The default installation path for QPA plugins is appended to
QT_QPA_PLATFORM_PLUGIN_PATH, making it unnecessary to wrap some applications and
preventing applications from loading platform plugins from the wrong Qt version.
2017-04-28 05:49:34 -05:00
Thomas Tuegel 44eb84feb6 qt58.qtbase: Update patch offsets 2017-04-28 05:49:34 -05:00
Dan Peebles 9046e54f6d qt5: fix to work on LLVM 4
(this is reapplying 6b1957d17a, which got
lost in a merge)

Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
2017-04-25 09:37:36 -04:00
Nikolay Amiantov ef1e28f5f6 qt56.qtwebengine: patch more library paths
Backport 040b86a96e.
2017-04-10 11:35:00 +03:00
Periklis Tsirakidis 775531c1e3 qt58: extend darwin compatibility 2017-04-08 09:54:46 +02:00
Dan Peebles 6b1957d17a qt5: fix to work on LLVM 4
Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
2017-04-06 21:00:28 -04:00