File tree 1 file changed +11
-6
lines changed
1 file changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -202,13 +202,18 @@ int main(const int argc, const char *const *const argv) {
202
202
std::vector<std::string> extraModulesFromEnv;
203
203
const auto * const extraModulesFromEnvData = []() {
204
204
auto * ret = getenv (" EXTRA_QT_MODULES" );
205
- if (ret == nullptr ) {
206
- ret = getenv (" EXTRA_QT_PLUGINS" );
207
- if (ret) {
208
- ldLog () << std::endl << LD_WARNING << " Using deprecated EXTRA_QT_PLUGINS env var" << std::endl;
209
- }
205
+
206
+ if (ret != nullptr ) {
207
+ return ret;
208
+ }
209
+
210
+ ret = getenv (" EXTRA_QT_PLUGINS" );
211
+ if (ret != nullptr ) {
212
+ ldLog () << std::endl << LD_WARNING << " Using deprecated EXTRA_QT_PLUGINS env var" << std::endl;
213
+ return ret;
210
214
}
211
- return ret;
215
+
216
+ return nullptr ;
212
217
}();
213
218
if (extraModulesFromEnvData != nullptr )
214
219
extraModulesFromEnv = linuxdeploy::util::split (std::string (extraModulesFromEnvData), ' ;' );
You can’t perform that action at this time.
0 commit comments