Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtcreator:version bump to 4.0.0 and fixed prefix path

Browse Source
This commit is contained in:
ayhanyalcinsoy
2016-05-22 23:40:21 +03:00
parent 5004febb20
commit 58db748d52
4 changed files with 24 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/toolkit/qtcreator/files/80-qtcreator.conf
-1
View File
@@ -1 +0,0 @@
/usr/lib/qtcreator
desktop/toolkit/qtcreator/files/qt-creator_rpath.patch
-15
View File
@@ -1,15 +0,0 @@
diff -rupN qt-creator-opensource-src-3.3.1/src/rpath.pri qt-creator-opensource-src-3.3.1-new/src/rpath.pri
--- qt-creator-opensource-src-3.3.1/src/rpath.pri 2015-02-19 11:16:46.000000000 +0100
+++ src/rpath.pri 2015-02-24 19:06:30.603703530 +0100
@@ -3,9 +3,8 @@ macx {
} else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
# this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
- QMAKE_RPATHDIR += \$\$ORIGIN
- QMAKE_RPATHDIR += \$\$ORIGIN/..
- QMAKE_RPATHDIR += \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator
+ QMAKE_RPATHDIR += $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator
+ QMAKE_RPATHDIR += $${QTC_PREFIX}/$${IDE_LIBRARY_BASENAME}/qtcreator/plugins
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'