Thomas Tuegel
e6fdc9f7f0
Merge pull request #16092 from abbradar/qt561
...
Qt: 5.6.0 -> 5.6.1
2016-06-09 14:32:53 -05:00
Nikolay Amiantov
97d791978c
qt56: 5.6.0 -> 5.6.1
2016-06-09 18:44:56 +03:00
Thomas Tuegel
de842765be
qt56.qtbase: propagate build inputs correctly
2016-06-09 09:14:06 -05:00
Nikolay Amiantov
693b49166a
qt5: remove gtkStyle option
...
It's no more needed now that we split QGtkStyle plugin
into separate output.
2016-06-03 19:14:52 +03:00
Thomas Tuegel
b2df0a10d9
qt56.qtbase: patch CMake module paths
2016-06-01 09:35:39 -05:00
Thomas Tuegel
d423a36aa5
Revert "qt56.qtbase: apply CMake setup-hook fix locally"
...
This reverts commit 6b6f067397
.
2016-06-01 07:02:47 -05:00
Thomas Tuegel
6b6f067397
qt56.qtbase: apply CMake setup-hook fix locally
2016-05-31 20:48:13 -05:00
Thomas Tuegel
ca34e075e4
qt56.qtbase: create symlink farm in one pass
2016-05-31 13:02:14 -05:00
Thomas Tuegel
e0d03c43bf
qt56: make symlink farm for CMake builds like QMake
2016-05-30 16:29:41 -05:00
Thomas Tuegel
95c5bfc2dc
qt55.qmakeHook: remove temporary directory in postInstall
...
Fixes #15556 . If the temporary directory is not removed, it will be
retained in RPATH, which is a serious security concern.
2016-05-29 14:07:03 -05:00
Thomas Tuegel
747517da48
qt56.qmakeHook: remove temporary directory in postInstall
...
Fixes #15556 . If the temporary directory is not removed, it will be
retained in RPATH, which is a serious security concern.
2016-05-28 16:06:03 -05:00
Vladimír Čunát
c2ee8e1033
qt56.qtbase: fix evaluation on darwin
...
/cc @ttuegel.
Maybe there's a better way; I didn't want to spend much time.
2016-05-20 12:48:50 +02:00
Thomas Tuegel
d22df66c54
qt56: remove fixQtModuleCMakeConfig
2016-05-11 10:19:28 -05:00
Thomas Tuegel
b63899c42f
qt55.qmakeHook: fix static library relocation
2016-05-09 10:01:07 -05:00
Thomas Tuegel
62d07ae7d4
qt56.qttools: add qtdeclarative dependency
2016-05-09 10:01:07 -05:00
Thomas Tuegel
0903faa3fb
qt56.qmakeHook: fix static library relocation
2016-05-09 10:01:06 -05:00
Thomas Tuegel
7c77230224
Remove Qt 5.4.2
2016-05-09 10:01:04 -05:00
Thomas Tuegel
ea90e3e6ca
qt56: init at 5.6.0
2016-05-09 10:01:03 -05:00
Thomas Tuegel
099c59ea4e
qt55.qmakeHook: fix error when package builds no libraries
2016-05-09 10:01:03 -05:00
Thomas Tuegel
3f6a2b9441
qt55.qtbase: build QGtkStyle by default
2016-04-30 12:20:09 -05:00
Thomas Tuegel
008b3d5d84
qt55.qtbase: move moveToOutput hooks
2016-04-30 12:20:09 -05:00
Thomas Tuegel
97d9368471
qmakeHook: move libtool archives and qmake project files to $dev/lib
2016-04-30 12:20:09 -05:00
Thomas Tuegel
9ea3e371df
qt5: handle dev output even without qmake
2016-04-21 04:57:01 -05:00
Nikolay Amiantov
039ff272ee
qt55: remove configureScript from qt5Submodule
2016-04-20 19:02:13 +03:00
Nikolay Amiantov
5b17e82559
qt55.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
4a4567b731
qt54.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
b857459bdb
qt5.qmakeHook: init, move from qtbase's setup hook
2016-04-20 18:55:37 +03:00
Thomas Tuegel
84a83feb4d
qt55.qtbase: do not link $out/lib into $dev/
2016-04-20 10:01:06 -05:00
Thomas Tuegel
d5c100dc21
makeQtWrapper: defer environment settings to prePhases
2016-04-20 10:01:06 -05:00
Thomas Tuegel
8727485e08
qt55.qtbase: canonicalize paths in addToSearchPathOnce
2016-04-20 10:01:06 -05:00
Thomas Tuegel
51fe07711f
qt55.qtbase: disable plugin path debugging
2016-04-20 10:01:06 -05:00
Thomas Tuegel
35f9c58206
qt55.qtquick1: get import paths from NIX_PROFILES
2016-04-20 10:01:06 -05:00
Thomas Tuegel
e0a87ce931
qt55.qtdeclarative: get import paths from NIX_PROFILES
2016-04-20 10:01:06 -05:00
Thomas Tuegel
e6c91d586c
qt55.qtbase: debug NIX_PROFILES paths
2016-04-20 10:01:06 -05:00
Vladimír Čunát
33b1dbb991
qt54.qttools: fix build
...
This one particular cmake directory seems not created by the build.
Skimming Hydra's status, this probably never worked since 35f33b438c
.
/cc @ttuegel.
2016-04-08 16:10:08 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Thomas Tuegel
314792d9eb
qtquick1: unset QML_IMPORT_PATH after loading
2016-03-31 16:12:35 -05:00
Thomas Tuegel
da4b9d3b62
qtdeclarative: unset QML2_IMPORT_PATH after loading
2016-03-31 16:08:24 -05:00
Thomas Tuegel
7f336a4513
qtbase: unset QT_PLUGIN_PATH after loading
2016-03-31 14:36:30 -05:00
Nikolay Amiantov
f752424924
qt55.qtbase: use more system libraries
2016-03-31 15:53:06 +03:00
Thomas Tuegel
aa2e03e6ff
qt55.qtbase: upstream patch for backing store issue
...
The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.
This patch is included in Qt 5.6, so we should remove it when we
upgrade.
2016-02-18 06:09:20 -06:00
Thomas Tuegel
f43eb5ece0
qt54.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
588c8499f7
qt55: don't set output flags by default
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2efbf665a3
qt55.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
0c79c7c3b2
qt54.qtconnectivity: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6e623f8784
qt54.qtenginio: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
b3c8878a65
qt54.qtlocation: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a7cce8b329
qt54.qtmultimedia: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d769d6c3bd
qt54.qtquick1: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2f0ec07921
qt54.qtsensors: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00