aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMathias Hasselmann <mathias.hasselmann@kdab.com>2017-02-28 10:53:01 +0100
committerMathias Hasselmann <mathias.hasselmann@kdab.com>2017-03-20 10:42:35 +0000
commit7c7915a2e750327a862e1117b05b9ad40955644d (patch)
treedd7c16ae9aedc533b8d336335e0132e0a936c689 /src
parentd46f5be033912da14c0c4305657d9815e190dfe1 (diff)
Android: Allow timeout to fade out splash screen
Change-Id: If78fe57fd5ceccad541fb2b3d7a92eefcda06057 Task-number: QTBUG-59200 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/androidextras/android/qandroidfunctions.cpp15
-rw-r--r--src/androidextras/android/qandroidfunctions.h3
2 files changed, 15 insertions, 3 deletions
diff --git a/src/androidextras/android/qandroidfunctions.cpp b/src/androidextras/android/qandroidfunctions.cpp
index 510788b..df9b2a2 100644
--- a/src/androidextras/android/qandroidfunctions.cpp
+++ b/src/androidextras/android/qandroidfunctions.cpp
@@ -231,11 +231,22 @@ void QtAndroid::runOnAndroidThreadSync(const QtAndroid::Runnable &runnable, int
\since 5.7
\fn void QtAndroid::hideSplashScreen()
- Hides the splash screen.
+ Hides the splash screen immediately.
*/
void QtAndroid::hideSplashScreen()
{
- QtAndroidPrivate::hideSplashScreen(QJNIEnvironmentPrivate());
+ hideSplashScreen(0);
+}
+
+/*!
+ \since 5.10
+ \fn void QtAndroid::hideSplashScreen(int duration)
+
+ Hides the splash screen, fading it for \a duration milliseconds.
+*/
+void QtAndroid::hideSplashScreen(int duration)
+{
+ QtAndroidPrivate::hideSplashScreen(QJNIEnvironmentPrivate(), duration);
}
QT_END_NAMESPACE
diff --git a/src/androidextras/android/qandroidfunctions.h b/src/androidextras/android/qandroidfunctions.h
index 220d75d..7095c1b 100644
--- a/src/androidextras/android/qandroidfunctions.h
+++ b/src/androidextras/android/qandroidfunctions.h
@@ -70,7 +70,8 @@ namespace QtAndroid
Q_ANDROIDEXTRAS_EXPORT void runOnAndroidThread(const Runnable &runnable);
Q_ANDROIDEXTRAS_EXPORT void runOnAndroidThreadSync(const Runnable &runnable, int timeoutMs = INT_MAX);
- Q_ANDROIDEXTRAS_EXPORT void hideSplashScreen();
+ Q_ANDROIDEXTRAS_EXPORT void hideSplashScreen(); // ### Qt6: merge with next overload
+ Q_ANDROIDEXTRAS_EXPORT void hideSplashScreen(int duration);
}
QT_END_NAMESPACE