Pass the APPLICATION_PARAMETERS variable if defined.

Change-Id: I2a3c049db43bbd0a2c373dae9e9ac1395c099b74
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
BogDan Vatra 2014-03-04 12:19:17 +02:00 committed by The Qt Project
parent 5ab630f8be
commit 1f695a31e2

View File

@ -634,11 +634,15 @@ public class QtActivity extends Activity
+ "\tQML_IMPORT_PATH=" + pluginsPrefix + "/imports"
+ "\tQT_PLUGIN_PATH=" + pluginsPrefix + "/plugins");
Intent intent = getIntent();
if (intent != null) {
String parameters = intent.getStringExtra("applicationArguments");
if (parameters != null)
loaderParams.putString(APPLICATION_PARAMETERS_KEY, parameters.replace(' ', '\t'));
if (APPLICATION_PARAMETERS != null) {
loaderParams.putString(APPLICATION_PARAMETERS_KEY, APPLICATION_PARAMETERS);
} else {
Intent intent = getIntent();
if (intent != null) {
String parameters = intent.getStringExtra("applicationArguments");
if (parameters != null)
loaderParams.putString(APPLICATION_PARAMETERS_KEY, parameters.replace(' ', '\t'));
}
}
loadApplication(loaderParams);