| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
| |
These tools have been moved to qtbase.
Change-Id: Idaf799d44be399040f9058252675c0ee3eecc39b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
|
|
|
|
|
|
|
|
|
| |
...instead of the deprecated Paths/Qml2Imports key.
Task-number: QTBUG-98335
Change-Id: I43f73ba6e6fc15d7bce3839faea3b0fc31d8e065
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Craig Scott <craig.scott@qt.io>
|
|
|
|
|
|
|
|
| |
This key is outdated.
Change-Id: I106980cecd63b9929551cbc81cf39f91a813a8ef
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Craig Scott <craig.scott@qt.io>
|
|
|
|
|
| |
Change-Id: If2fd409fbd53535cf4823bed831217c196a070ba
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Process::waitForFinished() has a default timeout of
30 seconds, but qmlimportscanner can in some cases
run for longer than that.
Pick-to: 5.15 6.2
Fixes: QTBUG-97104
Change-Id: Ie40d052ad6a4dc8643860163eb9a0c8f5859c3ae
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
|
|
|
|
| |
Change-Id: I778f3548bb43d4e5a70d4681e97853b7affcd9e5
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Use endsWith() instead of contains(), which will not
give a false positive for internal usages of the “_debug”
string in the library name.
Task-number: QTBUG-90982
Pick-to: 6.1 5.15
Change-Id: I22258ab2cc59e36d13fcdc078fcb2ad6381de102
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use QList<QString> instead of QSet<QString> to make
macdeployqt process rpaths in deterministic order
instead of arbitrary order based on the QString hash
value.
Make sure that the fallback QLibraryInfo::LibrariesPath
is added last in order to give preference to the actual
rpaths. (Use of LibrariesPath was added in an earlier
commit to cover cases where the app binary did not have
an rpath set that points to the Qt libs)
Task-number: QTBUG-53533
Change-Id: Ic8d91e196f50b8b43e6c09d5c64b7cdb01b8a8b2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
| |
Change-Id: Icf6905fb19696e3216a6467495909f89756156fd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
macdeployqt determines Qt's libinfix by examining the
naming of QtCore.framework, looking for the infix between
"QtCore" and ".framework".
This worked well until we added QtCore5Compat.framework.
Add check to make sure we don't pick "5Compat" as the
infix.
Fixes: QTBUG-94796
Pick-to: 6.1 6.2
Change-Id: I79b355c19e3826fe1e2a3677e8ec26e1abada11f
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
|
|
|
|
| |
The bearer plugin is no more; the tls implementations
are now proper plugins.
Change-Id: I153e425164089c6d26a0ca642c86c231bb728509
Pick-to: 6.1 6.2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
| |
Change-Id: I30a4542abfa5757985b3ee278c57eaba4af8caa6
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
|
|
|
| |
Adapts to qtdeclarative's c4425426278c1f5e94d51b465a746ab6a5ff74d7
Task-number: QTBUG-88791
Change-Id: I26d090818a17b194a4a206e184f406a43d259e3b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Uses QLibraryInfo to resolve plugins at installed locations.
[ChangeLog][macOS][macdeployqt] Uses QLibraryInfo to resolve plugins at install locations.
Fixes: QTBUG-91644
Change-Id: Ie309061024abd7a58ea62d707716342c99897c26
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes bug where a dependency would get skipped if otool didn't return
the plugin lib as the first entry.
[ChangeLog][macOS][macdeployqt] Fix plugin deployment bug caused by
otool parsing
Fixes: QTBUG-91644
Change-Id: Ibbfa40efcd046f386f9001f92bf956518176ecc7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
This includes removal of the corresponding .prev_CMakeLists.txt files.
Pick-to: 6.1
Task-number: QTBUG-88742
Change-Id: I3f360105a8cd43ad37dec6bfc6509ce95c79ee76
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
|
|
|
|
|
|
|
|
| |
The "2" is meaningless, and we get a better name now.
Task-number: QTBUG-85064
Change-Id: Ia4b98a3fdcd9aea3ac9f9009c6eecd64020f8c24
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This is macdeployqt’s lesser known cousin, which implemented
support for changing which Qt build an app would load.
Today, this can be accomplished by changing the LC_RPATH
loader command, or by writing a small script which
automates the necessary otool usage.
Change-Id: I01d8e3f89551d2becc2865be68728ca57870ac9c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|
|
|
|
| |
Change-Id: I701bbffaea2ea4c9237980cf18383038045fe28e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was skipping other files from Resources/ as well,
such as “en-GB.pak” and “QtWebEngineProcess”.
This reverts commit aabba72f7965e06e2e6ed960d8cf8078249dac8c.
Fixes: QTBUG-86759
Pick-to: 5.15
Change-Id: I6d27e3a32b479e1b6765783af71dd16826b181ca
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
These now use the new qt_internal_add_app function. Also the script
will output necessary code to set the icons and resource files for
each of the apps.
Task-number: QTBUG-85757
Change-Id: I1a336243fc53a7f329ca17e6c1e40818dabeae30
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Since the prl files are now in the Resources folder for a framework,
then we should avoid copying these as they are not needed in the
deployed framework.
Pick-to: 5.15
Change-Id: I0c728a647784b3d770bdd289c6deb8ff3d5ec9bd
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|
|
|
|
| |
Change-Id: I215dd95fe4467b2b2a7c24b1b5be523ef2e83980
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
|
|
|
|
|
| |
Change-Id: I25ce1be2f9b9d72e37513593ce2da3c7415f8ee2
Pick-to: 5.15
Reviewed-by: Mike Krus <mike.krus@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
With Xcode 11.4, in some cases it will have ", weak" as part of the
framework description when running otool. Therefore we need to account
for this so it still sees it as a valid entry.
Change-Id: I4018d42aa54f4e6434ee6defa119f3c913893819
Pick-to: 5.15
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
a bunch of .pro and configure.json file adjustments
and some conflicting cherry-picks from dev -> 5.15
that are merged into dev again
src/assistant/assistant/main.cpp
Change-Id: I174c00b6a300c6d46c4e081bdcb2f15f23ae9ef2
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
For notarization to succeed, several options have to be activated when
signing the application:
* the hardened runtime has to be activated
* a secure timestamp must be generated
* the application has to be signed with a Developer ID certificate
Add the option sign-for-notarization to conveniently activate both
options.
Change-Id: I7ddf3f36091f4d5d081166d32f65a4ab446536ce
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Apple now requires the developer to include a secure timestamp in the
application's signature in order for notarization to succeed.
Add an option to do this to macdeployqt.
Change-Id: Ia884de80822661abcf65a287e4dc8429ec24b766
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
I only need qdoc from qttools, but building the other tools takes up
quite a bit of time. qdoc already has a configure feature, so account
for the rest of them.
Change-Id: I0fc60393a1841229025c42b83d06f01668eb2680
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
|
| |
| |
| |
| |
| | |
Change-Id: Icea8323a6070f31234839ad56e36b73bcaec83bb
Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
dependencies.yaml
Change-Id: Ia86822a3b64be4e17d525f6b055eadfab7215bc8
|
| |\ \
| | |/
| | |
| | | |
Change-Id: Iff33dc736e4844af2c1c8e227ef1145d77fc1d85
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The Qt version was added in 5.14 "for use as eventual replacement for
QString::SplitBehavior." Move another step closer to that goal.
Change-Id: I7137cf8339bfe9fdcf4cb7cc695cb146aef410fb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: I674982e1a1f7d47bb1541f544ff1506a7cbe3a72
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add the option to place a file with the suffix .entitlements into the
Contents/Resources subdirectory of an application bundle. The
entitlements listed in the file will be used for signing.
Bundles that are depoloyed as part of another bundle (e.g. Helpers)
can specify a separate set of entitlements from the main bundle by
including an entitlements file of their own.
Only the first entitlement file per bundle will be used for signing as
the codesign tool will only use one entitlements file even when multple
are specified.
Task-number: QTBUG-77442
Change-Id: Iea356c1a70713f3a4b07281245a17fd7c87f6b11
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
|/ /
| |
| |
| |
| |
| | |
Change-Id: I4115bde9af38219682d0e6707bc7aa8fcb8d6bb0
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: I5f916f50d54ba36f9dd5b6c2c9aa6ce7fa2172bb
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Hardened runtime will be required when code signing for
app notarization, at some point in the future.
[ChangeLog][macdeployqt] Added "-hardened-runtime" option to support app notarization.
Change-Id: I4a3686ae01366c1e78372bb3b5e725db8e8061fd
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|\ \
| |/
|/|
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
src/windeployqt/main.cpp
Change-Id: I446b51332eaaec91f502fcc2ceca52291b0b0468
|
| |
| |
| |
| |
| |
| | |
Change-Id: Ie413ca2e2f81ac0e92628ffd2f3e93047a91bd0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... and of QLinkedList.
The change in QDesignerAbstractPropertySheetFactory is
straight-forward.
The rest are little buggers:
- In macdeployqt, the code iterates inside an if. Weird, but portable.
- In CppCodeParser, it's still somewhat harmless: just a call to
std::remove_if to avoid running into quadratic complexity, even
though the original loop had a good idea of iterating backwards,
saving at least some copies in the process. Need to take care there
that we continue to find the _first_ main.cpp, not the last, so add
a check for mainCpp.isEmpty().
- In QtGradientStopsModel, however, needed to work around the absence
of QMap::rbegin()/rend(), and it shows why they're missing: QMap's
funky op* makes it impossible to just use std::reverse_iterator to
do the heavy lifting. Use the recently-added QKeyValueIterator to
get an approximation. I say 'approximation', because that one lacks
operator->, so we need to use (*it).first, which brings back
memories of Qt 2's iterators...
Change-Id: I051e64b8d36b04ed2e7cf7695d9b797f08efaccb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
| |
Task-number: QTBUG-76491
Change-Id: Ied0ecb369697b3cc01fef7a2d91aa3940cdcd771
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
|
|\
| |
| |
| | |
Change-Id: Id06ccca252abc84720b18909f55019266426eb97
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When the gui module is used then the platforminputcontext plugins should
be deployed. Additionally if that includes the virtualkeyboard plugin
then those should also be deployed with it.
Change-Id: I2787792e91a9cfe3603a4e2e29273f682942bf36
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: If9dc5f167e9471b4633db73ae5a1cb8c1312b478
|
| |
| |
| |
| |
| |
| |
| | |
This patch adds deployment of the QtSpeech plugins.
Change-Id: Ifc55f40cdc0ed6fd9444993c04f4d76249649daf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
They already point to a regular file that will be hit at some point.
Change-Id: Iaa4818090b41bf5a2ecea29f4ae5a8b4f5641059
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: Icff4035509596e277f4612cdfa9363cdaa5371bf
|
| |\
| | |
| | |
| | | |
Change-Id: I59f4e4643896a857f30a50fb6d0758576e488e21
|
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-57265
Change-Id: I54320275aa614e76b65fdc82bb87a2850648bbdc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
|