TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
324 Commits 1 Branch 0 Tags
a3a6376573fcb17a5f1e8528d2ac2789ec5f5f49
Commit Graph

107 Commits

Author SHA1 Message Date
Martin Höher a3a6376573 Allow the qmake executable to be passed on CLI 
This change adds a new command line option `qmake` to the tool which
allows the user to specify the qmake executable to be used. By default,
if that option is omitted, the behavior is unchanged (i.e. the tool first
searches for the `qmake` executable and - if this is not successful -
then for either `qmake-qt5` or `qmake-qt4`. If the new option is used,
no search takes place and instead the executable provided is used as-is.

This implements a part of the functionality as discussed in issue #94.
 2017-05-17 21:30:22 +02:00
probonopd ea673893db Stop on ldd not found errors; use qmake-qt5 if needed 
Closes #101
 2017-04-06 22:12:08 +02:00
probonopd bace185665 See whether this makes any difference for setting the rpath of plugins 2017-04-03 21:13:18 +02:00
probonopd b71bd4d587 Deploy libraries in QML imports 2017-04-03 18:23:07 +02:00
probonopd 8f87719a32 Revert move, not sure if it makes a difference 2017-04-02 14:56:30 +02:00
probonopd 8e95f095dc Remove non-working code 2017-03-27 18:41:11 +02:00
probonopd 6926e89d15 Workaround for OBS builds 2017-03-27 18:01:53 +02:00
probonopd 2897666c50 Add verbosity concerning non-properly deployed libs 2017-03-26 22:33:25 +02:00
probonopd 60725dec9a Fix string patching 2017-03-26 21:16:29 +02:00
probonopd 8acc1cb3d9 Patch hardcoded paths for Arch Linux Qt 
Partially addresses https://github.com/probonopd/linuxdeployqt/issues/98
 2017-03-26 20:38:32 +02:00
probonopd a8515d1bda Patch all qt_* strings in libQt5Core.so that exist (#97) 
Closes https://github.com/probonopd/linuxdeployqt/issues/79
 2017-03-26 16:59:38 +02:00
probonopd af8d32bb8f Also exclude libnssutil3.so 
As per https://github.com/lirios/browser/issues/44#issuecomment-287635212
 2017-03-19 19:13:09 +01:00
Àlex Fiestas 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.
 2017-03-17 17:41:28 +01:00
Àlex Fiestas 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.
 2017-03-16 12:04:09 +01:00
Àlex Fiestas 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.
 2017-03-16 11:56:08 +01:00
probonopd fc571daf7b Always use qtToBeBundledInfo.value("QT_INSTALL_QML ") 2017-03-12 18:38:17 +01:00
probonopd 9359693d9f Do not exit because this could be a script that patchelf can't work on 2017-03-02 21:21:20 +01:00
Uwe Hermann 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)
                                    ^~~~~~~~~~
 2017-03-01 19:48:11 +01:00
probonopd 5b68f3af59 Warn about systm Qt when encountering Qt in /usr 2017-02-27 09:35:39 +01:00
probonopd eae604d254 Set qt_plugpath=plugins 
As per https://github.com/probonopd/linuxdeployqt/issues/75#issuecomment-280962215
 2017-02-20 01:25:09 +01:00
probonopd b32682ba8e Set qt_plugpath to ../plugins in an effort to solve #75 2017-02-20 00:38:06 +01:00
probonopd 3aca9d5c9b Clear qt_plugpath which may exist and may be set to /usr/... in distro Qt packages 2017-02-19 23:43:06 +01:00
probonopd 7adb7cc292 Add explicit {} 2017-02-19 14:01:46 +01:00
probonopd 2e5cfae904 Do not hardcode usr/ 2017-02-19 13:59:01 +01:00
probonopd 86ce8f84e2 Workaround to deploy Qt diretory to qt/ in FHS-like mode 2017-02-19 13:13:58 +01:00
probonopd a0a3e54851 Fix rpath, set to $ORIGIN/lib/ in non-FHS mode 2017-02-19 11:58:54 +01:00
probonopd 5df50f332b No longer generate qt.conf since we use qt_prfxpath now 2017-02-19 11:42:44 +01:00
probonopd 2e6835bc64 Set "qt_prfxpath=." or "qt_prfxpath=..", closes #12 2017-02-19 11:36:48 +01:00
probonopd 792c5cc9d5 Set "qt_prfxpath=." or "qt_prfxpath=../../", closes #12 2017-02-19 10:46:23 +01:00
probonopd 342524d2d1 Update shared.cpp 2017-02-18 15:05:59 +01:00
probonopd 8eef3f66be For now, use -n option for appimagetool, closes #71 2017-02-18 11:50:33 +01:00
U. Bruhin 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().
 2017-02-16 19:46:07 +01:00
probonopd c01275a7f6 Strip without -x 2017-02-14 23:30:53 +01:00
probonopd cb8cb3053b Merge branch 'master' into feature/fhs 2017-02-14 23:09:23 +01:00
probonopd c643d6a509 Do not run strip on files that contain rpath starting with $ 
Workaround for NixOS/patchelf#10?
 2017-02-14 22:55:45 +01:00
probonopd ff61e88162 Do not run strip on files that contain rpath starting with $ 
Workaround for https://github.com/NixOS/patchelf/issues/10?
 2017-02-14 22:31:38 +01:00
U. Bruhin 453fbfd163 Fix compile error when using Qt5.2 
Error message: 'QJsonValue::QJsonValue(const void*)' is private
 2017-02-12 23:09:51 +01:00
probonopd 334930bfaa Merge pull request #62 from atehxx/patch-2 
Improve bundling of Qt libs
 2017-02-05 21:49:59 +01:00
Manio a680de5b2b Improve bundling of Qt libs 
Workaround for not bundling Qt libs when Qt is installed in /usr/local/Qt...
 2017-01-30 18:06:57 +01:00
Manio 959ef98726 Update shared.cpp 
Final improvement to Qt WebEngine resources location
 2017-01-30 17:50:28 +01:00
Manio 92e02657d9 Update shared.h 
Add new function
 2017-01-30 17:47:38 +01:00
atehxx 97b8ba862b Update shared.cpp 
Fixed few paths to Web Engine resources as where they seem to be in 5.7.1
 2016-12-30 14:06:20 +01:00
probonopd d062245251 Deploy imageformats 2016-12-04 11:27:31 +01:00
probonopd 4951fd133b Deploy imageformats 2016-12-04 11:26:45 +01:00
probonopd 50c73383e4 Place qt.conf next to executable 2016-11-19 14:09:50 +01:00
probonopd 05f2f03a88 Continue FHS-like mode 2016-11-19 13:37:52 +01:00
probonopd 6fad088ed3 Started FHS-like mode; not quite working yet 2016-11-19 13:19:01 +01:00
Mikkel Krautz 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.
 2016-11-12 22:15:51 +01:00
Mikkel Krautz 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.
 2016-11-12 11:04:06 +01:00
probonopd 5c79e30f19 Also deploy plugins/iconengines/libqsvgicon.so whenever libQt5Svg.so.* is about to be deployed, closes #36 2016-11-04 16:18:18 +01:00