Skip to content

Commit 4acc201

Browse files
committed
Clarify deprecation of EXTRA_QT_PLUGINS and update README.md
Closes #197
1 parent 511d51d commit 4acc201

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ Just like all linuxdeploy plugins, the Qt plugin's behavior can be configured so
5757
**Qt specific:**
5858
- `$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`)
5959
- `$EXTRA_QT_MODULES=moduleA;moduleB`: Modules to deploy even if not found automatically by linuxdeploy-plugin-qt
60-
- example: `EXTRA_QT_MODULES=svg;` if you want to use the module [QtSvg](https://doc.qt.io/qt-5/qtsvg-index.html)
61-
- `$EXTRA_QT_PLUGINS=pluginA;pluginB`: extra Qt plugins to deploy
60+
- Example: `EXTRA_QT_MODULES=svg;` if you want to use the module [QtSvg](https://doc.qt.io/qt-5/qtsvg-index.html)
6261
- To support Wayland, add `waylandcompositor` to this variable
6362
- `$EXTRA_PLATFORM_PLUGINS=platformA;platformB`: Platforms to deploy in addition to `libqxcb.so`. Platform must be available from `QT_INSTALL_PLUGINS/platforms`.
6463
- To support Wayland, add `libqwayland-egl.so;libqwayland-generic.so`

src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ int main(const int argc, const char *const *const argv) {
100100
ldLog() << LD_ERROR << "No such file or directory:" << qmakePath << std::endl;
101101
return 1;
102102
}
103-
103+
104104
ldLog() << "Using qmake:" << qmakePath << std::endl;
105105

106106
auto qmakeVars = queryQmake(qmakePath);
@@ -211,7 +211,7 @@ int main(const int argc, const char *const *const argv) {
211211
if (ret == nullptr) {
212212
ret = getenv("EXTRA_QT_PLUGINS");
213213
if (ret) {
214-
ldLog() << std::endl << LD_WARNING << "Using deprecated EXTRA_QT_PLUGINS env var" << std::endl;
214+
ldLog() << std::endl << LD_WARNING << "Using deprecated EXTRA_QT_PLUGINS env var (renamed to EXTRA_QT_MODULES)" << std::endl;
215215
}
216216
}
217217
return ret;

0 commit comments

Comments
 (0)