| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
After discussing with some of the Objective-C
people I have finally got a fair number of the
warnings to disappear in both 10.5 and 10.6. I
also took the opportunity to remove a bunch of
other warnings.
Reviewed by: Morten Sørvig
|
| |\ \ \
| | |/ / |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
|\ \ \ \
| |/ / /
| | | /
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Bring Qt 4.6 into the Qt-S60 repo.
Conflicts:
configure.exe
mkspecs/features/qttest_p4.prf
qmake/generators/makefile.cpp
src/corelib/io/qdir.cpp
src/corelib/io/qprocess.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qobject.cpp
src/corelib/kernel/qsharedmemory_unix.cpp
src/corelib/thread/qthread_p.h
src/corelib/tools/qvector.h
src/gui/dialogs/qdialog.cpp
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qmessagebox.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsview.cpp
src/gui/image/qpixmapcache.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_p.h
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
src/gui/painting/qdrawhelper.cpp
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontengine_qpf.cpp
src/gui/widgets/qmenubar.cpp
src/network/socket/qlocalserver.cpp
src/testlib/qtestcase.cpp
src/testlib/testlib.pro
tests/auto/qimagereader/tst_qimagereader.cpp
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qpixmap/qpixmap.pro
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: 246130
Reviewed-by: joerg
Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we
decided to stick with Q_WS_WIN32, but having a separate define
makes the code more readable. In addition Q_WS_WINCE_WM is available
for Windows Mobile only parts, where we do not check for the OS on
runtime.
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This happens only on keyboard layouts like French. The is mainly due to
the key event processing done by the Input manager. In carbon, the key
down event has to be replayed after the input manager finishes his
processing. In Cocoa, while unmarking we have to accept the current text.
Task-number: 123740
Reviewed-by: nrc
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When disabling a widget that accepts keyboard input we disable input
context by calling QInputContext::setFocusWidget(0).
Reviewed-by: Prasanth Ullattil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QWizard sets focus on a widget when switching to a page before the widget
becomes visible, which caused problems with our ime handling which didn't
enable ime correctly. The fix is to refactor the code to enable ime handling
whenever someone tells input context to set focus by calling
QInputContext::setFocusWidget instead of relying on FocusIn/Out events and
duplicating updateImeStatus calls all over Qt..
Task-number: 244604
Reviewed-by: Prasanth Ullattil
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
We use a synchronous call rather than an asynchronous one, so we
don't risk the pointer being dereferenced after destruction is
finished.
|
| | |
| | |
| | |
| | | |
This reverts commit ba105741867dd96a9d58dcfcb78afef60e611bd6.
|
| | |
| | |
| | |
| | |
| | |
| | | |
We now commit the text if the mouse handler is invoked. This prevents
the case where the VK cannot be brought up because the widget is the
only focusable widget and is stuck in inline edit mode.
|
| | |
| | |
| | |
| | |
| | | |
If any of those hints are present, complex input is not possible,
so input methods should be turned off on Windows.
|
| | |
| | |
| | |
| | |
| | | |
If any of those hints are present, complex input is not possible,
so input methods should be turned off on X11.
|
|\ \ \ |
|
| | | | |
|
| | | | |
|
| | | | |
|
|/ / /
| | |
| | |
| | |
| | |
| | | |
In case the application is closing, we should not call process events
since event dispatcher is already deleted. Calling processEvents caused
application to oanic with KERN-EXEC 3 i.e. access violation.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This changes the appearance on X11 and Mac, but it seems to be the
way it is done in other applications.
In addition it fixes S60 background of preedit text, which is
supposed to be transparent.
RevBy: denis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This was done by making sure that the format code is called from both
start and update, because S60 will often return nothing in start, but
then later on return something in update.
In addition, we fall back on our own format if S60 does not give us
anything. Currently it seems to give us a format only when using
predictive text.
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/widgets/qmenu_symbian.cpp
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The input context *can* receive events for unfocused widgets, namely
when a CloseSoftwareInputPanel event is sent, or when a mouse event
is sent to a nonfocusable widget.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Made it more robust, as well as added support for the new
ImhDigitsOnly and ImhFormattedNumbers flags.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
RevBy: Trustme
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This is meant to be used by widgets to signal that they want input.
The event will then be passed on to QInputContext::filterEvent, which
can create an appropriate virtual keyboard on devices with touch
interface only.
RevBy: denis
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Configure.exe recompiled with MSVC6.
Conflicts:
configure.exe
examples/network/network.pro
src/gui/dialogs/qfiledialog_p.h
src/gui/dialogs/qfilesystemmodel_p.h
src/gui/kernel/qapplication.cpp
tests/auto/_Categories/qmake.txt
tests/auto/qfile/test/test.pro
tests/auto/qfile/tst_qfile.cpp
tests/auto/qlibrary/tst_qlibrary.cpp
tests/auto/qline/tst_qline.cpp
tests/auto/qstyle/tst_qstyle.cpp
tests/auto/qtextstream/tst_qtextstream.cpp
tests/auto/qtranslator/qtranslator.pro
tests/auto/qwaitcondition/tst_qwaitcondition.cpp
translations/qt_ja_JP.ts
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RevBy: Mauricek
Details: functions needs to be declared outside of the namespace
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Input methods didn't work properly wor widgets inside QWizardPage
because the widget got focus before it was shown and input context
wasn't initialized properly. The fix is to postpone
qinputcontext->setFocusWidget call until the widget is created (input
context will be initialized in the QWidget::create_sys function).
Task-number: 244604
Reviewed-by: Prasanth Ullattil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When a wiget that accepts keyboard input looses focus and the input
context is resetted we should clear the old preedit string by sending
an empty commit string only if the widget received non-empty pre-edit
string before.
Reviewed-by: Brad
|
| | |
|
|/ |
|
|
|