summaryrefslogtreecommitdiffstats
path: root/FUNCTIONS
diff options
context:
space:
mode:
authorTreeve Jelbert2016-03-18 19:44:42 +0100
committerTreeve Jelbert2016-03-18 19:44:42 +0100
commit6f7075635efad869f0085a526b07e0fdcb4c0d87 (patch)
tree7c4100b45568c9833e6933c34b0389f7f87eb466 /FUNCTIONS
parentf0d0b1b2d75c16d668f273e114752b8e85ce39d0 (diff)
FUNCTIONS remove borken hack
Diffstat (limited to 'FUNCTIONS')
-rwxr-xr-xFUNCTIONS9
1 files changed, 0 insertions, 9 deletions
diff --git a/FUNCTIONS b/FUNCTIONS
index bd075d83d0..97c88986e8 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -8,15 +8,6 @@ QT5DIR=$INSTALL_ROOT/opt/qt5
qt5_build() {
PATH="$QT5DIR/bin:$PATH"
export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
- # Nasty hack to ensure that locally built libs are always
- # used first to avoid conflict with installed old version.
- # Issues of this kind crop up regularily since years.
- # Supposedly, Qt 5.6 could fix this. My life is to short to
- # wait for and test this.
- # But see https://bugreports.qt.io/browse/QTBUG-50921 and
- # decide about removing this hack once it is resolved.
- sed -i "1s:^:LIBS+= -L$SOURCE_DIRECTORY/lib\n:" \
- $(find . -name '*.pro') &&
qmake PREFIX=$QT5DIR LIBDIR=$QT5DIR/lib \
$OPTS *.pro &&
make