7 commits

Author	SHA1	Message	Date
William A. Kennington III	d605663ae2	Merge branch 'master.upstream' into staging.upstream	2015-07-05 13:06:02 -07:00
Pascal Wittmann	8a3a3c7c4b	qt54: fix setup-hook.sh, lib/ was not populated in some cases	2015-07-01 20:38:03 +02:00
Thomas Tuegel	036f11f323	qt5: set location to qmake in setup-hook	2015-07-01 12:14:43 -05:00
Thomas Tuegel	9333155666	qt5: set paths correctly	2015-07-01 12:14:33 -05:00
Thomas Tuegel	09a53440f1	qt54: don't propagate build inputs ... This disables propagated of Qt 5 build inputs at the request of @edolstra. If this breaks your build, you need to add the missing dependencies yourself. If this breaks your package at runtime, you need to wrap your package to set either the plugin path or the QML import path.	2015-06-25 09:03:41 -05:00
Thomas Tuegel	5d1f6ad57c	qt5: make qt-5.4.1 default	2015-03-24 17:14:56 -05:00
Thomas Tuegel	2e38240c95	add qt-5.4	2015-02-21 11:39:18 -06:00