1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: use qEnvironmentVariableIntValue()

Browse Source 
It doesn't allocate memory, so cannot throw and is a lot faster
than qgetenv().

Change-Id: I6d79852613228658f9093a272edf9b434e60286c
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
This commit is contained in:
Marc Mutz 2014-09-09 11:46:55 +02:00
parent 6bc9e44433
commit 4aba06aa47
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/platforms/android/androidjniinput.cpp
View File

@ -184,7 +184,7 @@ namespace QtAndroidInput
static void longPress(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y) static void longPress(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y)
{ {
//### TODO: add proper API for Qt 5.2 //### TODO: add proper API for Qt 5.2
static bool rightMouseFromLongPress = qgetenv("QT_NECESSITAS_COMPATIBILITY_LONG_PRESS").toInt(); static bool rightMouseFromLongPress = qEnvironmentVariableIntValue("QT_NECESSITAS_COMPATIBILITY_LONG_PRESS");
if (!rightMouseFromLongPress) if (!rightMouseFromLongPress)
return; return;
m_ignoreMouseEvents = true; m_ignoreMouseEvents = true;

2
src/plugins/platforms/android/androidjnimain.cpp
View File

@ -423,7 +423,7 @@ namespace QtAndroid
bool blockEventLoopsWhenSuspended() bool blockEventLoopsWhenSuspended()
{ {
static bool block = qgetenv("QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED").toInt(); static bool block = qEnvironmentVariableIntValue("QT_BLOCK_EVENT_LOOPS_WHEN_SUSPENDED");
return block; return block;
} }

2
src/plugins/platforms/android/androidjnimenu.cpp
View File

@ -213,7 +213,7 @@ namespace QtAndroidMenu
env->DeleteLocalRef(env->CallObjectMethod(menuItem, setEnabledMenuItemMethodID, enabled)); env->DeleteLocalRef(env->CallObjectMethod(menuItem, setEnabledMenuItemMethodID, enabled));
if (!icon.isNull()) { // isNull() only checks the d pointer, not the actual image data. if (!icon.isNull()) { // isNull() only checks the d pointer, not the actual image data.
int sz = qMax(36, qgetenv("QT_ANDROID_APP_ICON_SIZE").toInt()); int sz = qMax(36, qEnvironmentVariableIntValue("QT_ANDROID_APP_ICON_SIZE"));
QImage img = icon.pixmap(QSize(sz,sz), QImage img = icon.pixmap(QSize(sz,sz),
enabled enabled
? QIcon::Normal ? QIcon::Normal

2
src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp
View File

@ -262,7 +262,7 @@ private:
AndroidAssetsFileEngineHandler::AndroidAssetsFileEngineHandler() AndroidAssetsFileEngineHandler::AndroidAssetsFileEngineHandler()
: m_assetsCache(std::max(5, qgetenv("QT_ANDROID_MAX_ASSETS_CACHE_SIZE").toInt())) : m_assetsCache(std::max(5, qEnvironmentVariableIntValue("QT_ANDROID_MAX_ASSETS_CACHE_SIZE")))
, m_hasPrepopulatedCache(false) , m_hasPrepopulatedCache(false)
, m_hasTriedPrepopulatingCache(false) , m_hasTriedPrepopulatingCache(false)
{ {

2
src/plugins/platforms/android/qandroidplatformscreen.cpp
View File

@ -92,7 +92,7 @@ QAndroidPlatformScreen::QAndroidPlatformScreen():QObject(),QPlatformScreen()
m_size = QSize(QAndroidPlatformIntegration::m_defaultScreenWidth, QAndroidPlatformIntegration::m_defaultScreenHeight); m_size = QSize(QAndroidPlatformIntegration::m_defaultScreenWidth, QAndroidPlatformIntegration::m_defaultScreenHeight);
// Raster only apps should set QT_ANDROID_RASTER_IMAGE_DEPTH to 16 // Raster only apps should set QT_ANDROID_RASTER_IMAGE_DEPTH to 16
// is way much faster than 32 // is way much faster than 32
if (qgetenv("QT_ANDROID_RASTER_IMAGE_DEPTH").toInt() == 16) { if (qEnvironmentVariableIntValue("QT_ANDROID_RASTER_IMAGE_DEPTH") == 16) {
m_format = QImage::Format_RGB16; m_format = QImage::Format_RGB16;
m_depth = 16; m_depth = 16;
} else { } else {

6
src/plugins/platforms/android/qandroidplatformtheme.cpp
View File

@ -180,7 +180,7 @@ QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const
{ {
switch (hint) { switch (hint) {
case StyleNames: case StyleNames:
if (qgetenv("QT_USE_ANDROID_NATIVE_STYLE").toInt() if (qEnvironmentVariableIntValue("QT_USE_ANDROID_NATIVE_STYLE")
&& (!qgetenv("MINISTRO_ANDROID_STYLE_PATH").isEmpty() && (!qgetenv("MINISTRO_ANDROID_STYLE_PATH").isEmpty()
|| QFileInfo(STYLES_PATH || QFileInfo(STYLES_PATH
+ QLatin1String(qgetenv("QT_ANDROID_THEME_DISPLAY_DPI")) + QLatin1String(qgetenv("QT_ANDROID_THEME_DISPLAY_DPI"))
@ -191,7 +191,7 @@ QVariant QAndroidPlatformTheme::themeHint(ThemeHint hint) const
case MouseDoubleClickDistance: case MouseDoubleClickDistance:
{ {
int minimumDistance = qgetenv("QT_ANDROID_MINIMUM_MOUSE_DOUBLE_CLICK_DISTANCE").toInt(); int minimumDistance = qEnvironmentVariableIntValue("QT_ANDROID_MINIMUM_MOUSE_DOUBLE_CLICK_DISTANCE");
int ret = minimumDistance; int ret = minimumDistance;
QAndroidPlatformIntegration *platformIntegration QAndroidPlatformIntegration *platformIntegration
@ -235,7 +235,7 @@ QString QAndroidPlatformTheme::standardButtonText(int button) const
bool QAndroidPlatformTheme::usePlatformNativeDialog(QPlatformTheme::DialogType type) const bool QAndroidPlatformTheme::usePlatformNativeDialog(QPlatformTheme::DialogType type) const
{ {
if (type == MessageDialog) if (type == MessageDialog)
return qgetenv("QT_USE_ANDROID_NATIVE_DIALOGS").toInt() == 1; return qEnvironmentVariableIntValue("QT_USE_ANDROID_NATIVE_DIALOGS") == 1;
return false; return false;
} }