I have made the following changes intended for : CE:MW:Shared / qt-components
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/6948 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6948: Messages from BOSS: State: review at 2012-10-05T12:08:40 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:MW / qt-components -> CE:MW:Shared / qt-components changes files: -------------- --- qt-components.changes +++ qt-components.changes @@ -0,0 +1,5 @@ +* Fri Oct 5 2012 Robin Burchell <[email protected]> - 1.4.3 +- TextField: work around QTBUG-25644 causing unreliable signals on focus events (from Robin) +- TextArea: work around QTBUG-25644 causing unreliable signals on focus events (from Robin) +- Fix build on platforms without HAVE_MEEGOGRAPHICSSYSTEM (from Robin) + old: ---- qt-components-1.4.2.tar.bz2 new: ---- qt-components-1.4.3.tar.bz2 spec files: ----------- --- qt-components.spec +++ qt-components.spec @@ -9,7 +9,7 @@ # << macros Summary: Qt Quick UX Components -Version: 1.4.2 +Version: 1.4.3 Release: 1 Group: System/Libraries License: BSD other changes: -------------- ++++++ qt-components-1.4.2.tar.bz2 -> qt-components-1.4.3.tar.bz2 --- src/meego/TextArea.qml +++ src/meego/TextArea.qml @@ -372,6 +372,18 @@ // that we get its original state back once the window has focus again. property bool savePersistentSelection: false + // FIXME: HACK: this is working around QTBUG-25644, FocusScope's signals + // aren't correctly emitted + onActiveFocusChanged: { + root.activeFocusChanged(root.activeFocus) + } + + // FIXME: HACK: this is working around QTBUG-25644, FocusScope's signals + // aren't correctly emitted + onFocusChanged: { + root.focusChanged(root.focus) + } + onWesternNumericInputEnforcedChanged: { inputContext.update(); } --- src/meego/TextField.qml +++ src/meego/TextField.qml @@ -426,6 +426,18 @@ } } + // FIXME: HACK: this is working around QTBUG-25644, FocusScope's signals + // aren't correctly emitted + onFocusChanged: { + root.focusChanged(root.focus) + } + + // FIXME: HACK: this is working around QTBUG-25644, FocusScope's signals + // aren't correctly emitted + onActiveFocusChanged: { + root.activeFocusChanged(root.activeFocus) + } + onTextChanged: { if(root.activeFocus) { TextAreaHelper.repositionFlickable(contentMovingAnimation) --- src/meego/themedaemon/mremotethemedaemonclient.cpp +++ src/meego/themedaemon/mremotethemedaemonclient.cpp @@ -52,7 +52,6 @@ #include <fcntl.h> #include <errno.h> #include <sys/types.h> -#include <unistd.h> #include <stdio.h> #include <sys/mman.h> #include <sys/msg.h> @@ -62,6 +61,8 @@ #ifdef Q_OS_WIN #include <qt_windows.h> +#else +#include <unistd.h> #endif using namespace M::MThemeDaemonProtocol; ++++++ qt-components.yaml --- qt-components.yaml +++ qt-components.yaml @@ -1,6 +1,6 @@ Name: qt-components Summary: Qt Quick UX Components -Version: 1.4.2 +Version: 1.4.3 Release: 1 Group: System/Libraries License: BSD
