Skip to content

Clarify deprecation of EXTRA_QT_PLUGINS and update README.md #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bjorn wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −4
Open

Clarify deprecation of EXTRA_QT_PLUGINS and update README.md #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ Just like all linuxdeploy plugins, the Qt plugin's behavior can be configured so
**Qt specific:**
- `$QMAKE=/path/to/my/qmake`: use another `qmake` binary to detect paths of plugins and other resources (usually doesn't need to be set manually, most Qt environments ship scripts changing `$PATH`)
- `$EXTRA_QT_MODULES=moduleA;moduleB`: Modules to deploy even if not found automatically by linuxdeploy-plugin-qt
- example: `EXTRA_QT_MODULES=svg;` if you want to use the module [QtSvg](https://doc.qt.io/qt-5/qtsvg-index.html)
- `$EXTRA_QT_PLUGINS=pluginA;pluginB`: extra Qt plugins to deploy
- Example: `EXTRA_QT_MODULES=svg;` if you want to use the module [QtSvg](https://doc.qt.io/qt-5/qtsvg-index.html)
- To support Wayland, add `waylandcompositor` to this variable
- `$EXTRA_PLATFORM_PLUGINS=platformA;platformB`: Platforms to deploy in addition to `libqxcb.so`. Platform must be available from `QT_INSTALL_PLUGINS/platforms`.
- To support Wayland, add `libqwayland-egl.so;libqwayland-generic.so`
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ int main(const int argc, const char *const *const argv) {
ldLog() << LD_ERROR << "No such file or directory:" << qmakePath << std::endl;
return 1;
}

ldLog() << "Using qmake:" << qmakePath << std::endl;

auto qmakeVars = queryQmake(qmakePath);
Expand Down Expand Up @@ -211,7 +211,7 @@ int main(const int argc, const char *const *const argv) {
if (ret == nullptr) {
ret = getenv("EXTRA_QT_PLUGINS");
if (ret) {
ldLog() << std::endl << LD_WARNING << "Using deprecated EXTRA_QT_PLUGINS env var" << std::endl;
ldLog() << std::endl << LD_WARNING << "Using deprecated EXTRA_QT_PLUGINS env var (renamed to EXTRA_QT_MODULES)" << std::endl;
}
}
return ret;
Expand Down