summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qclipboard.cpp11
-rw-r--r--src/gui/kernel/qkeysequence.cpp2
2 files changed, 12 insertions, 1 deletions
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index 399216d27c..771f0fe93d 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -137,6 +137,17 @@ QT_BEGIN_NAMESPACE
\endlist
+ \section1 Notes for Universal Windows Platform Users
+
+ \list
+
+ \li The Universal Windows Platform only allows to query the
+ clipboard in case the application is active and an application
+ window has focus. Accessing the clipboard data when in background
+ will fail due to access denial.
+
+ \endlist
+
\sa QGuiApplication
*/
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index b15ea78f7a..6d9f0b0417 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -1158,7 +1158,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
lastI = i + 1;
}
- int p = accel.lastIndexOf(QLatin1Char('+'), str.length() - 2); // -2 so that Ctrl++ works
+ int p = accel.lastIndexOf(QLatin1Char('+'), accel.length() - 2); // -2 so that Ctrl++ works
QStringRef accelRef(&accel);
if(p > 0)
accelRef = accelRef.mid(p + 1);