diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-11 09:35:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-11 09:35:52 +0200 |
| commit | 474af549e4fc8a662031ec87880a1ecb97da2154 (patch) | |
| tree | bf9f734631189f771ff92a1215d6bda1978d61d0 /src/macdeployqt/shared/shared.h | |
| parent | 341d55b7cdf8bbb5a045ab21ac1396d1ea766344 (diff) | |
| parent | ff440191de244307c968b251faee4122267d3094 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/macdeployqt/shared/shared.h
src/qdoc/sections.cpp
Change-Id: I708a20d0061e82b99ecced7d24e7a2b8c475f706
Diffstat (limited to 'src/macdeployqt/shared/shared.h')
| -rw-r--r-- | src/macdeployqt/shared/shared.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/macdeployqt/shared/shared.h b/src/macdeployqt/shared/shared.h index 587ca0fc0..588b5dd62 100644 --- a/src/macdeployqt/shared/shared.h +++ b/src/macdeployqt/shared/shared.h @@ -105,6 +105,8 @@ public: bool useLoaderPath; bool isFramework; bool isDebug; + + bool containsModule(const QString &module, const QString &libInFix) const; }; inline QDebug operator<<(QDebug debug, const ApplicationBundleInfo &info); |