b0cb33c9de
Revert "No longer generate qt.conf since we use qt_prfxpath now"
Possible workaround for #98 , #99 , #122
This reverts commit 5df50f332b
8 years ago
f6664faaf9
Update shared.cpp
8 years ago
ea673893db
Stop on ldd not found errors; use qmake-qt5 if needed
Closes #101
8 years ago
bace185665
See whether this makes any difference for setting the rpath of plugins
8 years ago
b71bd4d587
Deploy libraries in QML imports
8 years ago
8f87719a32
Revert move, not sure if it makes a difference
8 years ago
8e95f095dc
Remove non-working code
8 years ago
6926e89d15
Workaround for OBS builds
8 years ago
2897666c50
Add verbosity concerning non-properly deployed libs
8 years ago
60725dec9a
Fix string patching
8 years ago
8acc1cb3d9
Patch hardcoded paths for Arch Linux Qt
Partially addresses https://github.com/probonopd/linuxdeployqt/issues/98
8 years ago
a8515d1bda
Patch all qt_* strings in libQt5Core.so that exist ( #97 )
Closes https://github.com/probonopd/linuxdeployqt/issues/79
8 years ago
af8d32bb8f
Also exclude libnssutil3.so
As per https://github.com/lirios/browser/issues/44#issuecomment-287635212
8 years ago
0fea9e03d2
Fix a typo in "QT_INSTALL_QML" key usage (removing extra space)
The key with a space at the end does not seem to exists neither in my
testing environment (container reproducing current travis.yml file) nor
on my main system.
8 years ago
a1a4923ba3
Exclude /usr/local from being detected as "Distribution Qt"
/usr/local is the canonical place to put self built applications and
libraries so it should be exlucded from the logic to detect distribution
shipped Qt.
8 years ago
ac9e9db2d0
Remove or replace all uses of qmlImportsPath by qtToBeBundledInfo
It seems that the removal of qmlImportsPath was half-done and there were
still some uses of it around.
8 years ago
fc571daf7b
Always use qtToBeBundledInfo.value("QT_INSTALL_QML ")
8 years ago
9359693d9f
Do not exit because this could be a script that patchelf can't work on
8 years ago
a6e35bc727
Fix two compiler warnings.
../shared/shared.cpp: In function ‘LibraryInfo parseLddLibraryLine(const QString&, const QString&, const QSet<QString>&)’:
../shared/shared.cpp:220:102: warning: unused parameter ‘rpaths’ [-Wunused-parameter]
LibraryInfo parseLddLibraryLine(const QString &line, const QString &appDirPath, const QSet<QString> &rpaths)
^~~~~~
../shared/shared.cpp: In function ‘void stripAppBinary(const QString&)’:
../shared/shared.cpp:681:36: warning: unused parameter ‘bundlePath’ [-Wunused-parameter]
void stripAppBinary(const QString &bundlePath)
^~~~~~~~~~
8 years ago
5b68f3af59
Warn about systm Qt when encountering Qt in /usr
8 years ago
eae604d254
Set qt_plugpath=plugins
As per https://github.com/probonopd/linuxdeployqt/issues/75#issuecomment-280962215
8 years ago
b32682ba8e
Set qt_plugpath to ../plugins in an effort to solve #75
8 years ago
3aca9d5c9b
Clear qt_plugpath which may exist and may be set to /usr/... in distro Qt packages
8 years ago
7adb7cc292
Add explicit {}
8 years ago
2e5cfae904
Do not hardcode usr/
8 years ago
86ce8f84e2
Workaround to deploy Qt diretory to qt/ in FHS-like mode
8 years ago
a0a3e54851
Fix rpath, set to $ORIGIN/lib/ in non-FHS mode
8 years ago
5df50f332b
No longer generate qt.conf since we use qt_prfxpath now
8 years ago
2e6835bc64
Set "qt_prfxpath=." or "qt_prfxpath=..", closes #12
8 years ago
792c5cc9d5
Set "qt_prfxpath=." or "qt_prfxpath=../../", closes #12
8 years ago
342524d2d1
Update shared.cpp
8 years ago
8eef3f66be
For now, use -n option for appimagetool, closes #71
8 years ago
acf38544a8
Fix failure when creating qt.conf
The creation of the qt.conf file has failed with following error:
QIODevice::write (QFile, "app.AppDir/opt/bin/app/../qt.conf"): device not open
This was caused by an invalid file path (appending "/../" to a file to
get its parent directory is not allowed). Fixed it by cleaning the path
with QDir::cleanPath().
8 years ago
c01275a7f6
Strip without -x
8 years ago
c643d6a509
Do not run strip on files that contain rpath starting with $
Workaround for NixOS/patchelf#10 ?
8 years ago
ff61e88162
Do not run strip on files that contain rpath starting with $
Workaround for https://github.com/NixOS/patchelf/issues/10 ?
8 years ago
453fbfd163
Fix compile error when using Qt5.2
Error message: 'QJsonValue::QJsonValue(const void*)' is private
8 years ago
a680de5b2b
Improve bundling of Qt libs
Workaround for not bundling Qt libs when Qt is installed in /usr/local/Qt...
8 years ago
959ef98726
Update shared.cpp
Final improvement to Qt WebEngine resources location
8 years ago
92e02657d9
Update shared.h
Add new function
8 years ago
97b8ba862b
Update shared.cpp
Fixed few paths to Web Engine resources as where they seem to be in 5.7.1
8 years ago
d062245251
Deploy imageformats
8 years ago
4951fd133b
Deploy imageformats
8 years ago
50c73383e4
Place qt.conf next to executable
8 years ago
05f2f03a88
Continue FHS-like mode
8 years ago
6fad088ed3
Started FHS-like mode; not quite working yet
8 years ago
f95bb9c1ca
shared/shared.cpp: improve Linux VDSO detection.
This commit improves the the VDSO lookup mechanism
by supporting the shared object names of the VDSO
object for other architectures.
8 years ago
d57f180179
shared/shared.cpp: remove a few minor C++11-isms.
These are the only issues preventing linuxdeployqt
from building on non-C++11 compilers.
Uses of the range-based for loop are replaced with
Qt's foreach macro.
Uses of auto are replaced with appropriate types.
8 years ago
5c79e30f19
Also deploy plugins/iconengines/libqsvgicon.so whenever libQt5Svg.so.* is about to be deployed, closes #36
8 years ago
f45c7e3156
Improved the way Qt files are located
Using 'qmake -query' to get all information explicitly instead of parsing
the output of 'qmake -v' and deriving binary path, plugin path and QML
path from there.
Fixes #28
Fixes #37
8 years ago
probonopd
Àlex Fiestas
Uwe Hermann
U. Bruhin
Manio
Mikkel Krautz
Thorbjørn Lindeijer