AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Skip globalstatic threadStressTest on QEMU"

Browse Source
This commit is contained in:
Toni Saario 2021-03-03 21:03:25 +02:00 committed by Qt CI Bot
commit 90371e9250
9 changed files with 101 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java
View File

@ -280,7 +280,7 @@ public class QtActivityDelegate
}, 5);
}
public void showSoftwareKeyboard(final int x, final int y, final int width, final int height, final int inputHints, final int enterKeyType)
public void showSoftwareKeyboard(final int x, final int y, final int width, final int height, final int editorHeight, final int inputHints, final int enterKeyType)
{
if (m_imm == null)
return;
@ -302,7 +302,7 @@ public class QtActivityDelegate
if (softInputIsHidden)
return;
} else {
if (height > visibleHeight)
if (editorHeight > visibleHeight)
m_activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
else
m_activity.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN);
@ -419,12 +419,12 @@ public class QtActivityDelegate
if (metrics.widthPixels > metrics.heightPixels) { // landscape
if (m_landscapeKeyboardHeight != r.bottom) {
m_landscapeKeyboardHeight = r.bottom;
showSoftwareKeyboard(x, y, width, height, inputHints, enterKeyType);
showSoftwareKeyboard(x, y, width, height, editorHeight, inputHints, enterKeyType);
}
} else {
if (m_portraitKeyboardHeight != r.bottom) {
m_portraitKeyboardHeight = r.bottom;
showSoftwareKeyboard(x, y, width, height, inputHints, enterKeyType);
showSoftwareKeyboard(x, y, width, height, editorHeight, inputHints, enterKeyType);
}
}
} else {
@ -575,6 +575,13 @@ public class QtActivityDelegate
}
}
public void updateInputItemRectangle(final int x, final int y, final int w, final int h)
{
if (m_layout == null || m_editText == null || !m_keyboardIsVisible)
return;
m_layout.setLayoutParams(m_editText, new QtLayout.LayoutParams(w, h, x, y), true);
}
public boolean loadApplication(Activity activity, ClassLoader classLoader, Bundle loaderParams)
{
/// check parameters integrity

17
src/android/jar/src/org/qtproject/qt/android/QtNative.java
View File

@ -883,10 +883,25 @@ public class QtNative
});
}
private static void updateInputItemRectangle(final int x,
final int y,
final int w,
final int h)
{
runAction(new Runnable() {
@Override
public void run() {
m_activityDelegate.updateInputItemRectangle(x, y, w, h);
}
});
}
private static void showSoftwareKeyboard(final int x,
final int y,
final int width,
final int height,
final int editorHeight,
final int inputHints,
final int enterKeyType)
{
@ -894,7 +909,7 @@ public class QtNative
@Override
public void run() {
if (m_activityDelegate != null)
m_activityDelegate.showSoftwareKeyboard(x, y, width, height, inputHints, enterKeyType);
m_activityDelegate.showSoftwareKeyboard(x, y, width, height, editorHeight, inputHints, enterKeyType);
}
});
}

11
src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java
View File

@ -1074,6 +1074,11 @@ public class QtActivity extends Activity
QtNative.activityDelegate().resetSoftwareKeyboard();
}
public void updateInputItemRectangle(final int x, final int y, final int w, final int h)
{
QtNative.activityDelegate().updateInputItemRectangle(x, y, w, h);
}
public boolean setKeyboardVisibility(boolean visibility, long timeStamp)
{
return QtNative.activityDelegate().setKeyboardVisibility(visibility, timeStamp);
@ -1090,10 +1095,10 @@ public class QtActivity extends Activity
}
public void showSoftwareKeyboard(final int x, final int y, final int width,
final int height, final int inputHints,
final int enterKeyType)
final int height, final int editorHeight,
final int inputHints, final int enterKeyType)
{
QtNative.activityDelegate().showSoftwareKeyboard(x, y, width, height, inputHints, enterKeyType);
QtNative.activityDelegate().showSoftwareKeyboard(x, y, width, height, editorHeight, inputHints, enterKeyType);
}
public boolean startApplication()

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

@ -79,15 +79,16 @@ namespace QtAndroidInput
candidatesEnd);
}
void showSoftwareKeyboard(int left, int top, int width, int height, int inputHints, int enterKeyType)
void showSoftwareKeyboard(int left, int top, int width, int height, int editorHeight, int inputHints, int enterKeyType)
{
QJniObject::callStaticMethod<void>(applicationClass(),
"showSoftwareKeyboard",
"(IIIIII)V",
"(IIIIIII)V",
left,
top,
width,
height,
editorHeight,
inputHints,
enterKeyType);
#ifdef QT_DEBUG_ANDROID_IM_PROTOCOL
@ -129,6 +130,17 @@ namespace QtAndroidInput
anchor.x(), anchor.y(), rtl);
}
void updateInputItemRectangle(int left, int top, int width, int height)
{
QJniObject::callStaticMethod<void>(applicationClass(),
"updateInputItemRectangle",
"(IIII)V",
left,
top,
width,
height);
}
static void mouseDown(JNIEnv */*env*/, jobject /*thiz*/, jint /*winId*/, jint x, jint y)
{
if (m_ignoreMouseEvents)

4
src/plugins/platforms/android/androidjniinput.h
View File

@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
namespace QtAndroidInput
{
// Software keyboard support
void showSoftwareKeyboard(int top, int left, int width, int height, int inputHints, int enterKeyType);
void showSoftwareKeyboard(int top, int left, int width, int editorHeight, int height, int inputHints, int enterKeyType);
void resetSoftwareKeyboard();
void hideSoftwareKeyboard();
bool isSoftwareKeyboardVisible();
@ -57,6 +57,8 @@ namespace QtAndroidInput
void updateSelection(int selStart, int selEnd, int candidatesStart, int candidatesEnd);
// Software keyboard support
// edit field resize
void updateInputItemRectangle(int left, int top, int width, int height);
// cursor/selection handles
void updateHandles(int handleCount, QPoint editMenuPos = QPoint(), uint32_t editButtons = 0,
QPoint cursor = QPoint(), QPoint anchor = QPoint(), bool rtl = false);

44
src/plugins/platforms/android/qandroidinputcontext.cpp
View File

@ -47,6 +47,7 @@
#include "qandroideventdispatcher.h"
#include "qandroidinputcontext.h"
#include "qandroidplatformintegration.h"
#include "private/qhighdpiscaling_p.h"
#include <QTextBoundaryFinder>
#include <QTextCharFormat>
@ -59,7 +60,6 @@
#include <qthread.h>
#include <qwindow.h>
#include <qpa/qplatformwindow.h>
QT_BEGIN_NAMESPACE
namespace {
@ -491,7 +491,7 @@ QAndroidInputContext::QAndroidInputContext()
m_androidInputContext = this;
QObject::connect(QGuiApplication::inputMethod(), &QInputMethod::cursorRectangleChanged,
this, &QAndroidInputContext::updateSelectionHandles);
this, &QAndroidInputContext::updateInputItemRectangle);
QObject::connect(QGuiApplication::inputMethod(), &QInputMethod::anchorRectangleChanged,
this, &QAndroidInputContext::updateSelectionHandles);
QObject::connect(QGuiApplication::inputMethod(), &QInputMethod::inputItemClipRectangleChanged, this, [this]{
@ -889,12 +889,50 @@ void QAndroidInputContext::showInputPanel()
else
m_updateCursorPosConnection = connect(qGuiApp->focusObject(), SIGNAL(cursorPositionChanged()), this, SLOT(updateCursorPosition()));
QRect rect = screenInputItemRectangle();
QRect rect = cursorRect();
QtAndroidInput::showSoftwareKeyboard(rect.left(), rect.top(), rect.width(), rect.height(),
screenInputItemRectangle().height(),
query->value(Qt::ImHints).toUInt(),
query->value(Qt::ImEnterKeyType).toUInt());
}
QRect QAndroidInputContext::cursorRect()
{
QSharedPointer<QInputMethodQueryEvent> query = focusObjectInputMethodQuery();
// if single line, we do not want to mess with the editor's position, as we do not
// have to follow the cursor in vertical axis
if (query.isNull()
|| (query->value(Qt::ImHints).toUInt() & Qt::ImhMultiLine) != Qt::ImhMultiLine)
return {};
auto im = qGuiApp->inputMethod();
if (!im)
return {};
const auto cursorRect= im->cursorRectangle().toRect();
QRect finalRect(inputItemRectangle().toRect());
const QWindow *window = qGuiApp->focusWindow();
const double pd = window
? QHighDpiScaling::factor(window)
: QHighDpiScaling::factor(QtAndroid::androidPlatformIntegration()->screen());
finalRect.setY(cursorRect.y() * pd);
finalRect.setHeight(cursorRect.height() * pd);
//fiddle a bit with vert margins, so the tracking rectangle is not too tight.
finalRect += QMargins(0, cursorRect.height() / 4, 0, cursorRect.height() / 4);
return finalRect;
}
void QAndroidInputContext::updateInputItemRectangle()
{
QRect rect = cursorRect();
if (!rect.isValid())
return;
QtAndroidInput::updateInputItemRectangle(rect.left(), rect.top(),
rect.width(), rect.height());
updateSelectionHandles();
}
void QAndroidInputContext::showInputPanelLater(Qt::ApplicationState state)
{
if (state != Qt::ApplicationActive)

2
src/plugins/platforms/android/qandroidinputcontext.h
View File

@ -138,6 +138,7 @@ public:
public slots:
void safeCall(const std::function<void()> &func, Qt::ConnectionType conType = Qt::BlockingQueuedConnection);
void updateCursorPosition();
void updateInputItemRectangle();
void updateSelectionHandles();
void handleLocationChanged(int handleId, int x, int y);
void touchDown(int x, int y);
@ -154,6 +155,7 @@ private:
bool focusObjectIsComposing() const;
void focusObjectStartComposing();
bool focusObjectStopComposing();
QRect cursorRect();
private:
ExtractedText m_extractedText;

1
tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
View File

@ -12,4 +12,5 @@ qt_internal_add_test(tst_qglobalstatic
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::TestPrivate
)

5
tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
View File

@ -35,6 +35,8 @@
#include <sys/resource.h>
#endif
#include <QtTest/private/qemulationdetector_p.h>
class tst_QGlobalStatic : public QObject
{
Q_OBJECT
@ -179,6 +181,9 @@ Q_GLOBAL_STATIC_WITH_ARGS(ThrowingType, threadStressTestGS, (threadStressTestCon
void tst_QGlobalStatic::threadStressTest()
{
if (QTestPrivate::isRunningArmOnX86())
QSKIP("Frequently hangs on QEMU, QTBUG-91423");
class ThreadStressTestThread: public QThread
{
public: