profile/ivi/qtbase.git
13 years agoAdd QEventDispatcherMac.
Morten Sorvig [Thu, 9 Jun 2011 09:18:27 +0000 (11:18 +0200)]
Add QEventDispatcherMac.

Create it directly in QGuiApplication for now,
later on we'll move it to the cocoa plugin.

13 years agoRemove QPlatformEventLoopIntegration.
Morten Sorvig [Thu, 9 Jun 2011 09:13:49 +0000 (11:13 +0200)]
Remove QPlatformEventLoopIntegration.

Instead we'll let the platform plugins construct
an QEventDispatcherQPA subclass. This API will be
added later on.

This temporarily breaks cocoa, uikit and opencode.

13 years agoBail out from cursor creation when malloc fails.
Laszlo Agocs [Thu, 9 Jun 2011 09:05:56 +0000 (11:05 +0200)]
Bail out from cursor creation when malloc fails.

13 years agoGet modifier mapping using standard X, no need for libxkbcommon here.
Laszlo Agocs [Thu, 9 Jun 2011 08:39:08 +0000 (10:39 +0200)]
Get modifier mapping using standard X, no need for libxkbcommon here.

Reviewed-by: Samuel Rødal
13 years agoCreate custom cursors via XRender.
Laszlo Agocs [Wed, 8 Jun 2011 15:41:12 +0000 (17:41 +0200)]
Create custom cursors via XRender.

Reviewed-by: Samuel Rødal
13 years agoCursor support in xcb plug-in.
Laszlo Agocs [Tue, 7 Jun 2011 13:38:45 +0000 (15:38 +0200)]
Cursor support in xcb plug-in.

Custom cursor pixmaps with depth greater than 1 are not yet supported
and will be converted to monochrome always.

Reviewed-by: Samuel Rødal
13 years agoAvoid out of bounds write
Lars Knoll [Wed, 8 Jun 2011 12:24:17 +0000 (14:24 +0200)]
Avoid out of bounds write

Reviewed-by: Samuel
13 years agoUndefine DrawText in qlineedit.cpp
Olli Werwolff [Wed, 8 Jun 2011 10:34:29 +0000 (12:34 +0200)]
Undefine DrawText in qlineedit.cpp

There is a #define DrawText DrawTextW in winuser.h which is included
in windows.h so that the enum value in line 1981 is seen as DrawTextW
and thus is not a valid enum value on Windows.

Reviewed-by: Samuel
Reviewed-by: Lars Knoll
13 years agoMost checks for windows in widgets have to be ws specific
Olli Werwolff [Wed, 8 Jun 2011 09:48:38 +0000 (11:48 +0200)]
Most checks for windows in widgets have to be ws specific

Reviewed-by: Samuel
Reviewed-by: Lars Knoll
13 years agouse correct includes in qaccessible_win.cpp/qwizard_win_p.h
Olli Werwolff [Wed, 8 Jun 2011 11:39:21 +0000 (13:39 +0200)]
use correct includes in qaccessible_win.cpp/qwizard_win_p.h

Reviewed-by: Samuel
Reviewed-by: Lars Knoll
13 years agoDo not compile _win files when -qpa is used
Olli Werwolff [Wed, 8 Jun 2011 09:46:12 +0000 (11:46 +0200)]
Do not compile _win files when -qpa is used

Reviewed-by: Samuel
Reviewed-by: Lars Knoll
13 years agoQTextDocumentLayout has to be exported as it is used in widgets
Olli Werwolff [Wed, 8 Jun 2011 07:36:27 +0000 (09:36 +0200)]
QTextDocumentLayout has to be exported as it is used in widgets

Reviewed-by: Samuel
Reviewed-by: Lars Knoll
13 years agoFixed compilation with QT_NO_PRINTER
Olli Werwolff [Wed, 8 Jun 2011 07:35:38 +0000 (09:35 +0200)]
Fixed compilation with QT_NO_PRINTER

Reviewed-by: Samuel
Reviewed-by: Lars Knoll
13 years agocosmetic changes
Lars Knoll [Wed, 8 Jun 2011 11:46:09 +0000 (13:46 +0200)]
cosmetic changes

13 years agoFix behaviour after WM_TAKE_FOCUS
Lars Knoll [Tue, 7 Jun 2011 19:53:52 +0000 (21:53 +0200)]
Fix behaviour after WM_TAKE_FOCUS

We should not call requestActivateWindow() in
reaction to WM_TAKE_FOCUS. Looks like it should
only be done if the focus should in fact go
to a modal child of the widget.

13 years agoUse Q_WIDGETS_EXPORT for widgets library
Olli Werwolff [Wed, 8 Jun 2011 07:51:07 +0000 (09:51 +0200)]
Use Q_WIDGETS_EXPORT for widgets library

Reviewed-by: Lars Knoll
13 years agorevert accidental commit
Lars Knoll [Tue, 7 Jun 2011 14:45:28 +0000 (16:45 +0200)]
revert accidental commit

13 years agoremove unused code
Lars Knoll [Tue, 7 Jun 2011 14:44:23 +0000 (16:44 +0200)]
remove unused code

13 years agocleanups code
Lars Knoll [Tue, 7 Jun 2011 14:29:35 +0000 (16:29 +0200)]
cleanups code

Make QXcbClipboard and QXcbDrag a QXcbObject to simplify
the code.
Use the predefined atoms in xproto.h instead of our own
defines.

13 years agoImplement QDropEvent::source() again
Lars Knoll [Tue, 7 Jun 2011 13:07:44 +0000 (15:07 +0200)]
Implement QDropEvent::source() again

QDropEvent::source() now returns a QObject
instead of a widget, matching the implementation
in QDrag.

Reviewed-by: Samuel
13 years agoreset certain global variables on deletion
Lars Knoll [Tue, 7 Jun 2011 13:06:53 +0000 (15:06 +0200)]
reset certain global variables on deletion

qt_button_down needs to be reset to 0 if it
points to the widget being deleted.

Reviewed-by: Samuel
13 years agoProtect against deleted windows
Lars Knoll [Tue, 7 Jun 2011 13:04:55 +0000 (15:04 +0200)]
Protect against deleted windows

Check that the window is still there before
trying to deliver an event to it.

Reviewed-by: Samuel
13 years agoInitialize variable
Lars Knoll [Tue, 7 Jun 2011 13:04:35 +0000 (15:04 +0200)]
Initialize variable

Reviewed-by: Samuel
13 years agoFix some remaining issues with DnD
Lars Knoll [Tue, 7 Jun 2011 11:35:12 +0000 (13:35 +0200)]
Fix some remaining issues with DnD

Do not set the event mask of the window
we drop onto to NO_EVENT. Always use the
clipboards requestor window to convert
selections.

Reviewed-by: Samuel
13 years agoadd WM support class
Lars Knoll [Tue, 7 Jun 2011 08:33:23 +0000 (10:33 +0200)]
add WM support class

Add a QXcbWMSupport class to better integrate with
NET_WM compliant window managers.

Suppport NET_WM_USER_TIME on windows.

Reviewed-by: Samuel
13 years agoImplement XDnD in the xcb plugin
Lars Knoll [Sun, 5 Jun 2011 21:29:26 +0000 (23:29 +0200)]
Implement XDnD in the xcb plugin

Ported most of the code to support dragging
from qdnd_x11.cpp to xcb. Some features are still
not working 100% correct, but it's becoming
usable.

Reviewed-by: Samuel
13 years agoX11 DnD implementation
Lars Knoll [Thu, 2 Jun 2011 21:20:47 +0000 (23:20 +0200)]
X11 DnD implementation

Initial code for DnD on X11. Only Xdnd based,
Motif DnD is being ignored.

The code is currently limited to dropping
stuff onto the application. Starting drags
is not yet implemented.

Reviewed-by: Samuel
13 years agoAdd a startDrag to QPlatformDrag
Lars Knoll [Thu, 2 Jun 2011 21:19:36 +0000 (23:19 +0200)]
Add a startDrag to QPlatformDrag

This can be used to initialize data
when a drag starts. The Xdnd implementation
at least has a need for it.

Reviewed-by: Samuel
13 years agoCocoa: Implement raise() and lower().
Morten Sorvig [Tue, 7 Jun 2011 10:06:26 +0000 (12:06 +0200)]
Cocoa: Implement raise() and lower().

13 years agoCocoa: Implement setWindowTitle.
Morten Sorvig [Tue, 7 Jun 2011 09:12:38 +0000 (11:12 +0200)]
Cocoa: Implement setWindowTitle.

13 years agoFix Cocoa mouse position handling.
Morten Sorvig [Tue, 7 Jun 2011 08:48:21 +0000 (10:48 +0200)]
Fix Cocoa mouse position handling.

I'm not sure what "local" and "global" means for
QWindowSystemInterface::handleMouseEvent. Sending
the mouse position in window coordinates for both
works.

13 years agoBuildfix for Mac OS
Richard Moe Gustavsen [Mon, 6 Jun 2011 13:28:32 +0000 (15:28 +0200)]
Buildfix for Mac OS

Since 'widgets' now is a separate library outside GUI, some
previously hidden symbols now needs to be exported. This patch
will make 'widgets' build.

13 years agoMade tst_QWidget::updateWhileMinimized() pass.
Samuel Rødal [Mon, 6 Jun 2011 13:54:11 +0000 (15:54 +0200)]
Made tst_QWidget::updateWhileMinimized() pass.

This requires adding a couple of window system interface events, namely
Map, Unmap, and Expose. When a widget is minimized on X11 it is
unmapped, and thus update requests should not be delivered. Instead the
event will delivered when the widget is mapped, which causes an Expose
event to be sent. The Unmap and Expose event thus need to be handled in
QWidgetWindow, and Map is also added for the purpose of API symmetry
(and for future needs).

13 years agoFixed warning about missing return in qmessagebox.cpp
Samuel Rødal [Mon, 6 Jun 2011 13:50:40 +0000 (15:50 +0200)]
Fixed warning about missing return in qmessagebox.cpp

13 years agoSet visibility state.
Morten Sorvig [Mon, 6 Jun 2011 12:48:37 +0000 (14:48 +0200)]
Set visibility state.

13 years agoMake building of platform plugins indifferent if its out of source
Jørgen Lind [Mon, 6 Jun 2011 06:45:02 +0000 (08:45 +0200)]
Make building of platform plugins indifferent if its out of source

This requires some source files to be shipped with the Qt install
They are now copied into QT_INSTALL_DATA/platform

13 years agoMade tst_QWidget::repaintWhenChildDeleted() pass.
Samuel Rødal [Mon, 6 Jun 2011 10:37:55 +0000 (12:37 +0200)]
Made tst_QWidget::repaintWhenChildDeleted() pass.

Implement some missing functionality in QWidget::destroy().

13 years agoPrevent tst_QWidget::showAndMoveChild() from failing on KDE.
Samuel Rødal [Mon, 6 Jun 2011 10:11:07 +0000 (12:11 +0200)]
Prevent tst_QWidget::showAndMoveChild() from failing on KDE.

Since we grab the desktop the KDE task bar appears on top of the window
we're interested in. It's preferable to make the window a bit smaller.

13 years agoAvoid setting the active window to null when there is a FocusIn queued.
Laszlo Agocs [Mon, 6 Jun 2011 08:02:06 +0000 (10:02 +0200)]
Avoid setting the active window to null when there is a FocusIn queued.

13 years agoImplemented QXcbScreen::topLevelAt(const QPoint &p).
Samuel Rødal [Mon, 6 Jun 2011 07:07:46 +0000 (09:07 +0200)]
Implemented QXcbScreen::topLevelAt(const QPoint &p).

This makes the tst_QWidget::widgetAt() auto-test pass.

13 years agoMake XCB plugin work better in combination with auto-tests.
Samuel Rødal [Mon, 6 Jun 2011 07:00:13 +0000 (09:00 +0200)]
Make XCB plugin work better in combination with auto-tests.

When an auto-test calls processEvents() indirectly via QTest::qWait(),
QAbstractEventDispatcher::aboutToBlock() doesn't get emitted since
the processEvents() implementation gets called without
the QEventLoop::WaitForMoreEvents flag set. Since the auto-tests depend
on all events getting delivered, we need to process the XCB events on
awake() as well.

13 years agoMade the tst_QWidget::widgetAt() test a bit more robust.
Samuel Rødal [Mon, 6 Jun 2011 06:57:37 +0000 (08:57 +0200)]
Made the tst_QWidget::widgetAt() test a bit more robust.

The QTRY_VERIFY() should include the whole test, not just whether we got
a widget or not, since it might be the wrong one.

13 years agoBasic QDesktopWidget support.
Samuel Rødal [Fri, 3 Jun 2011 12:35:09 +0000 (14:35 +0200)]
Basic QDesktopWidget support.

Makes it possible to use grabWindow on the desktop widget with the xcb
plugin, which gives us a few more passing tests in tst_QWidget.

13 years agoRemove tst_QWidget::painterRedirection().
Samuel Rødal [Fri, 3 Jun 2011 12:00:56 +0000 (14:00 +0200)]
Remove tst_QWidget::painterRedirection().

We've removed support for painter redirection, QWidget::render() should
be used instead.

13 years agoRemove out-of-date TODOs.
Laszlo Agocs [Fri, 3 Jun 2011 12:01:49 +0000 (14:01 +0200)]
Remove out-of-date TODOs.

13 years agoPrevent crash in QXcbIntegration::grabWindow().
Samuel Rødal [Fri, 3 Jun 2011 11:54:08 +0000 (13:54 +0200)]
Prevent crash in QXcbIntegration::grabWindow().

Copy the image explicitly before calling QPixmap::fromImage().

13 years agoImplemented QXcbIntegration::grabWindow().
Samuel Rødal [Fri, 3 Jun 2011 11:39:12 +0000 (13:39 +0200)]
Implemented QXcbIntegration::grabWindow().

13 years agoAdd support for mouse and keyboard grab.
Laszlo Agocs [Fri, 3 Jun 2011 09:30:23 +0000 (11:30 +0200)]
Add support for mouse and keyboard grab.

Reviewed-by: Samuel Rødal
13 years agoPrevent crash in tst_QWidget::persistentWinId().
Samuel Rødal [Fri, 3 Jun 2011 08:07:01 +0000 (10:07 +0200)]
Prevent crash in tst_QWidget::persistentWinId().

Only call createWinId() if we have a parent widget set.

13 years agoGet rid of superfluous debug output in the xcb plugin.
Samuel Rødal [Fri, 3 Jun 2011 08:00:03 +0000 (10:00 +0200)]
Get rid of superfluous debug output in the xcb plugin.

13 years agoMade tst_QWidget::winIdChangeEvent() pass with Lighthouse.
Samuel Rødal [Fri, 3 Jun 2011 07:57:57 +0000 (09:57 +0200)]
Made tst_QWidget::winIdChangeEvent() pass with Lighthouse.

We need to call setWinId() at appropriate times, and enable creation of
native handles for child widgets when createWinId() is called.

13 years agoMerge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor
Jørgen Lind [Wed, 1 Jun 2011 14:00:16 +0000 (16:00 +0200)]
Merge branch 'refactor' of scm.dev.nokia.troll.no:qt/qtbase-staging into refactor

13 years agoCompile fix
Jørgen Lind [Wed, 1 Jun 2011 13:55:15 +0000 (15:55 +0200)]
Compile fix

13 years agoMerge remote-tracking branch 'base/master' into refactor
Jørgen Lind [Wed, 1 Jun 2011 13:34:58 +0000 (15:34 +0200)]
Merge remote-tracking branch 'base/master' into refactor

Conflicts:
src/gui/embedded/qmousepc_qws.cpp
src/gui/embedded/qwslock.cpp
src/plugins/decorations/default/default.pro
src/plugins/decorations/styled/styled.pro
src/plugins/decorations/windows/windows.pro
src/plugins/gfxdrivers/ahi/ahi.pro
src/plugins/gfxdrivers/directfb/directfb.pro
src/plugins/gfxdrivers/eglnullws/eglnullws.pro
src/plugins/gfxdrivers/linuxfb/linuxfb.pro
src/plugins/gfxdrivers/qvfb/qvfb.pro
src/plugins/gfxdrivers/transformed/transformed.pro
src/plugins/gfxdrivers/vnc/vnc.pro
src/plugins/graphicssystems/meego/meego.pro
src/plugins/graphicssystems/opengl/opengl.pro
src/plugins/graphicssystems/openvg/openvg.pro
src/plugins/graphicssystems/shivavg/shivavg.pro
src/plugins/graphicssystems/trace/trace.pro
src/plugins/kbddrivers/linuxinput/linuxinput.pro
src/plugins/mousedrivers/linuxtp/linuxtp.pro
src/plugins/mousedrivers/pc/pc.pro
src/plugins/mousedrivers/tslib/tslib.pro
src/plugins/platforms/minimal/minimal.pro
tests/auto/qerrormessage/qerrormessage.pro

13 years agoHave tooltips shown properly with xcb.
Laszlo Agocs [Wed, 1 Jun 2011 13:32:58 +0000 (15:32 +0200)]
Have tooltips shown properly with xcb.

13 years agoMake tst_QWidget::ensureCreated() pass with -platform xcb.
Samuel Rødal [Wed, 1 Jun 2011 12:28:49 +0000 (14:28 +0200)]
Make tst_QWidget::ensureCreated() pass with -platform xcb.

We need the parent-creation logic to be enabled on QPA as well.

13 years agosockets: limit buffer size of the internal sockets in proxy engines
Shane Kearns [Tue, 24 May 2011 13:05:48 +0000 (14:05 +0100)]
sockets: limit buffer size of the internal sockets in proxy engines

The application can normally control the amount of buffering of a
socket or QNetworkReply by using the setReadBufferSize API.
This allows the application to flow control the TCP connection, and
avoids out of memory errors when the data being downloaded is received
faster than the application can process it.

However when using a proxy, the proxy socket engine has an internal
socket which is used to communicate with the proxy server. It is not
visible to the user, and does not have awareness of the buffer size of
the external socket.

To solve this, we limit the internal sockets' buffer size to 64k bytes.
Under normal operation, the data is swiftly copied to the external
socket where the buffer can grow (or not) based on the application's
set value for read buffer size.

Task-number: QT-4966
Reviewed-by: Markus Goetz
(cherry picked from commit c4727a85eed57a4db698326a1bed4aa75b6e5284)

Change-Id: I29e6628e38b79b41c4464ba8cb772a0f03717043
Reviewed-on: http://codereview.qt.nokia.com/153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Markus Goetz
13 years agoPrevent XSetInputFocus BadMatch errors.
Samuel Rødal [Wed, 1 Jun 2011 11:02:57 +0000 (13:02 +0200)]
Prevent XSetInputFocus BadMatch errors.

The BadMatch errors are generated if XSetInputFocus is called before the
window has been mapped, so we need to set a flag when we get the map
notify event.

13 years agoStart using libxkbcommon in the xcb plug-in.
Laszlo Agocs [Wed, 1 Jun 2011 09:00:58 +0000 (11:00 +0200)]
Start using libxkbcommon in the xcb plug-in.

13 years agoDo not choke on zero-sized windows.
Laszlo Agocs [Wed, 1 Jun 2011 08:37:30 +0000 (10:37 +0200)]
Do not choke on zero-sized windows.

Configure requests with zero width or height will always
fail with BadValue and have to be avoided. Same goes for
shm segments of size 0.

13 years agoadd a platform interface for DnD
Lars Knoll [Tue, 31 May 2011 18:45:27 +0000 (20:45 +0200)]
add a platform interface for DnD

Use the simple in process DnD implementation
for xcb.

13 years agoClean up DnD code
Lars Knoll [Mon, 30 May 2011 20:20:15 +0000 (22:20 +0200)]
Clean up DnD code

Some cleanups of the DnD code to prepare for
creating a platform API.

13 years agoMake TextEdit word selection more natural.
Andrew den Exter [Fri, 13 May 2011 03:49:20 +0000 (13:49 +1000)]
Make TextEdit word selection more natural.

QTextControl will only extend the selection to a word if the cursor is
directly over it which prevents the selection being extended if the
mouse is dragged up or down a to a shorter line of text making it
difficult to select multiple lines of text.  Just disable that
limitation when the TextEdit word selection is enabled.

Change-Id: I3b9d1575c0141db8441197d740de94a90eacc077
Task-number: QTBUG-19230
Reviewed-by: Martin Jones
Reviewed-on: http://codereview.qt.nokia.com/292
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoEnsure the TextEdit cursor delegate is repositioned on mouse events.
Andrew den Exter [Mon, 9 May 2011 03:57:34 +0000 (13:57 +1000)]
Ensure the TextEdit cursor delegate is repositioned on mouse events.

Update the micro focus when a mouse press changes the cursor position
of a read only TextEdit.

Change-Id: I11855037f7938b2cd23ac6ad165722b5289b4f46
Task-number: QTBUG-19109
Reviewed-by: Martin Jones
Reviewed-on: http://codereview.qt.nokia.com/291
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoDon't crash on an invalid replacementStart from an input method.
Andrew den Exter [Mon, 9 May 2011 04:04:08 +0000 (14:04 +1000)]
Don't crash on an invalid replacementStart from an input method.

Ensure the cursor position does not exceed the bounds of the
current text.

Change-Id: If38f7729372562324d11eadd1a976c0c6da91863
Task-number: QTBUG-19054
Reviewed-by: Martin Jones
(cherry picked from commit 6fbfb1ab3f26ad672eb24f9b4a0ce1a8eea08298)
Reviewed-on: http://codereview.qt.nokia.com/290
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoFix build in C++0x mode
Bernhard Rosenkraenzer [Mon, 30 May 2011 09:31:42 +0000 (11:30 +0159)]
Fix build in C++0x mode

This fixes compiler errors (gcc 4.6 -std=gnu++0x on x86_64 Linux):

embedded/qwslock.cpp: In function `bool forceLock(int, int, int)':
embedded/qwslock.cpp:121:39: error: narrowing conversion of `semNum'
        from `int' to `short unsigned int' inside { } [-fpermissive]

(and equivalent errors in other lines/files)

See
http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf
Section 8.5.4/6

Change-Id: I2cbac5482b87f33287a416af5a5c9bde621720bc
Reviewed-By: Olivier Goffart
Merge-Request: 1240
Reviewed-on: http://codereview.qt.nokia.com/275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoRemove some QWidget autotest that have become irrelevant with -qpa.
Samuel Rødal [Tue, 31 May 2011 14:02:54 +0000 (16:02 +0200)]
Remove some QWidget autotest that have become irrelevant with -qpa.

We can't use windowing system specific checks on Lighthouse because the
windowing system is now plugin-dependent.

13 years agoFix the egl path for xcb and wayland plugins
Jørgen Lind [Tue, 31 May 2011 13:47:02 +0000 (15:47 +0200)]
Fix the egl path for xcb and wayland plugins

Reviewed-by: Samuel Rødal
13 years agoHave a sensible default double click interval.
Laszlo Agocs [Tue, 31 May 2011 12:18:47 +0000 (14:18 +0200)]
Have a sensible default double click interval.

Having 0 as default would disable double clicks completely which
is not really good.

Reviewed-by: Samuel Rødal
13 years agoFix for excess creation of QWindow instances.
Laszlo Agocs [Tue, 31 May 2011 11:38:42 +0000 (13:38 +0200)]
Fix for excess creation of QWindow instances.

topData() is called from various functions for any kind of widgets,
not just for top-levels. Therefore createTLSysExtra cannot assume
that the widget is top-level. Previously QWindows were created
for desktop widget, toolbars, mdi subwindows, etc. which is
wrong. The patch will avoid this, and will also fix drawing
isses when dragging mdi windows.

Reviewed-by: Samuel Rødal
13 years agoMade qpluginbase.pri into a feature profile.
axis [Fri, 27 May 2011 08:10:36 +0000 (10:10 +0200)]
Made qpluginbase.pri into a feature profile.

This enables other modules to use it without having access to the
QtBase sources.

Change-Id: I0a588b2e14ca88fa068c7c2bcc69ff669444f6c6
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/237
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMoved certain qmake config variables to .qmake.cache.
axis [Fri, 27 May 2011 13:36:22 +0000 (15:36 +0200)]
Moved certain qmake config variables to .qmake.cache.

The reason is that these are local to the build, and should not be
present inside the qmodule.pri file, because this file is installed.

Change-Id: I2207f2bf068b1aafd14e60d106c7028ca53d5efd
Task: QTBUG-19585
Reviewed-on: http://codereview.qt.nokia.com/238
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoFix QWidget::windowHandle().
Laszlo Agocs [Tue, 31 May 2011 10:36:46 +0000 (12:36 +0200)]
Fix QWidget::windowHandle().

The window member in extra should remain null for widgets
that do not have a native window. The change introduced
in an earlier commit is clearly wrong.

13 years agoNew configure.exe binary: Qt 5 with QT3_SUPPORT removed.
Friedemann Kleint [Tue, 31 May 2011 09:11:43 +0000 (11:11 +0200)]
New configure.exe binary: Qt 5 with QT3_SUPPORT removed.

13 years agoconfigure.exe: Remove QT3_SUPPORT.
Friedemann Kleint [Tue, 31 May 2011 09:10:44 +0000 (11:10 +0200)]
configure.exe: Remove QT3_SUPPORT.

As it is causing compile problems.

13 years agoWindows: Bring back the HDC to the raster engine, Q_OS_WIN.
Friedemann Kleint [Tue, 31 May 2011 08:22:55 +0000 (10:22 +0200)]
Windows: Bring back the HDC to the raster engine, Q_OS_WIN.

13 years agoFix isTopLevel() in QWindow.
Laszlo Agocs [Tue, 31 May 2011 08:04:04 +0000 (10:04 +0200)]
Fix isTopLevel() in QWindow.

This also makes modal hints set properly for dialogs so the
additional checks during active window change are not needed
anymore.

Reviewed-by: Samuel Rødal
13 years agoSet xcb size hints properly avoid strange behaviour.
Laszlo Agocs [Tue, 31 May 2011 07:26:55 +0000 (09:26 +0200)]
Set xcb size hints properly avoid strange behaviour.

Strange behaviour means incorrect dialog sizes, inability to resize,
X crashes, etc. These were caused by not properly filling the size
hint structure, leaving possibly random garbage in it.

Reviewed-by: Samuel Rødal
13 years agoFixed linking against QtQuickTest on mac.
Charles Yin [Fri, 27 May 2011 04:43:13 +0000 (14:43 +1000)]
Fixed linking against QtQuickTest on mac.

qmltest is now a Qt module, so it's not necessary to configure
the include&library paths manually.

Change-Id: I1d2baa67138e08ab9007fba9f6adcf8847509ba8
Reviewed-on: http://codereview.qt.nokia.com/163
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoExport the qt_gl_read_framebuffer function for use in declarative
Gunnar Sletta [Mon, 30 May 2011 13:33:21 +0000 (15:33 +0200)]
Export the qt_gl_read_framebuffer function for use in declarative

Change-Id: Ia1dd186ca954774e1faaa4b2e606acac9333d9b0
Reviewed-on: http://codereview.qt.nokia.com/224
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
13 years agoMade QXcbConnection::atomName() more fail safe.
Laszlo Agocs [Mon, 30 May 2011 13:48:22 +0000 (15:48 +0200)]
Made QXcbConnection::atomName() more fail safe.

Reviewed-by: Samuel Rødal
13 years agoSupport placing cursor in ligature with mouse or touch
Jiang Jiang [Thu, 19 May 2011 08:29:49 +0000 (10:29 +0200)]
Support placing cursor in ligature with mouse or touch

We need to find out the closest element in the ligature to
the point we clicked (or tapped), currently we do this by
dividing the width of that ligature glyph evenly by the number
of characters it covered. We only support Common and Greek script
at this point, ligatures in other scripts are still handled as a
whole.

Task-number: QTBUG-19260
Reviewed-by: Eskil
(cherry picked from commit 5338d78aa9d80ddd2bcb21e6b22cd2cf1522a7d3)

Change-Id: Ic747e9458d561aca0848dcd1e8b94e0a23fd8189
Reviewed-on: http://codereview.qt.nokia.com/196
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoExamples: QPA window example does not require widgets.
Friedemann Kleint [Mon, 30 May 2011 13:08:33 +0000 (15:08 +0200)]
Examples: QPA window example does not require widgets.

13 years agoDo not scroll in QXcbWindowSurface when m_image is not yet created.
Laszlo Agocs [Mon, 30 May 2011 12:58:55 +0000 (14:58 +0200)]
Do not scroll in QXcbWindowSurface when m_image is not yet created.

Reviewed-by: Samuel Rødal
13 years agocompile with QT_NO_CUPS
Lars Knoll [Mon, 30 May 2011 12:43:56 +0000 (14:43 +0200)]
compile with QT_NO_CUPS

13 years agoCleanup code for copy/paste of text
Lars Knoll [Sun, 29 May 2011 19:20:28 +0000 (21:20 +0200)]
Cleanup code for copy/paste of text

Remove support for COMPOUND_TEXT. All apps should
these days support UTF8_STRING. If not they'll have to live
with STRING or TEXT.

ICCCM states that TEXT is in the encoding of choice. Make this
latin1 instead of local8bit. XA_STRING is defined to be latin1,
so don't use local8bit here neither.

13 years agocorrectly decode pasted text
Lars Knoll [Thu, 26 May 2011 01:11:13 +0000 (03:11 +0200)]
correctly decode pasted text

13 years agopartially working paste
Lars Knoll [Thu, 26 May 2011 00:47:32 +0000 (02:47 +0200)]
partially working paste

We now paste something from the clipboard,
but the format conversion seems to be
still off at times.

13 years agoadd an xcb based clipboard implementation
Lars Knoll [Wed, 25 May 2011 23:35:29 +0000 (01:35 +0200)]
add an xcb based clipboard implementation

Copying from the app to somewhere else works
fine, but pasting into the app is still broken.

13 years agoDon't leak xcb events
Lars Knoll [Wed, 25 May 2011 19:50:18 +0000 (21:50 +0200)]
Don't leak xcb events

Correctly free the xcb events delivered to
the xcb plugin.

13 years agoCorrectly define standard XA_FOO atoms
Lars Knoll [Sun, 22 May 2011 21:50:32 +0000 (23:50 +0200)]
Correctly define standard XA_FOO atoms

13 years agoAdd xcb based mime type handling
Lars Knoll [Sun, 22 May 2011 20:23:48 +0000 (22:23 +0200)]
Add xcb based mime type handling

Reworked the code from the xlib lighthouse
plugin to remove most of the Xlib dependencies.

The code originally comdes from qdnd_x11.cpp

13 years agoHave proper warnings shown when xcb window surface creation fails.
Laszlo Agocs [Mon, 30 May 2011 12:18:52 +0000 (14:18 +0200)]
Have proper warnings shown when xcb window surface creation fails.

Reviewed-by: Samuel Rødal
13 years agoAvoid dialog and other widgets with non-adjusted window flags.
Laszlo Agocs [Mon, 30 May 2011 12:17:40 +0000 (14:17 +0200)]
Avoid dialog and other widgets with non-adjusted window flags.

Reviewed-by: Samuel Rødal
13 years agoAdd focus and modal dialog support.
Laszlo Agocs [Mon, 30 May 2011 12:16:43 +0000 (14:16 +0200)]
Add focus and modal dialog support.

Reviewed-by: Samuel Rødal
13 years agoThe proper fix for subwindow parenting issues.
Laszlo Agocs [Fri, 27 May 2011 14:06:53 +0000 (16:06 +0200)]
The proper fix for subwindow parenting issues.

The previous patch tried to work around the fact that Qt::SubWindow
accidentally pulled in Qt::Window. This patch corrects the root
cause of the problem.

13 years agoCompile on Mac.
Morten Sorvig [Thu, 26 May 2011 12:36:15 +0000 (14:36 +0200)]
Compile on Mac.

Use the unix QPrinterInfo implementation.

13 years agoAdd QPlatformPrinterSupport.
Friedemann Kleint [Mon, 30 May 2011 09:18:46 +0000 (11:18 +0200)]
Add QPlatformPrinterSupport.

Add QPlatformPrinterSupport which provides functionality for
obtaining QPrinterInfo and creating native printer engines.

Rubber-stamped-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoOnly add dependent include when not already there
Marius Storm-Olsen [Fri, 27 May 2011 18:43:30 +0000 (13:43 -0500)]
Only add dependent include when not already there

Change-Id: I517ad8188a6f6b5ade763f0189f434f446ab6f05
Reviewed-on: http://codereview.qt.nokia.com/198
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoFix ligature offset in multi-line text
Jiang Jiang [Fri, 20 May 2011 08:26:54 +0000 (10:26 +0200)]
Fix ligature offset in multi-line text

Reviewed-by: Eskil
(cherry picked from commit 278cf1f37945050c4a46d5acab0659f3a7546a43)

Change-Id: Ice20aa38a49ea16cf56bd3705c7d400ee165a9c2
Reviewed-on: http://codereview.qt.nokia.com/195
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>