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.
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.
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.
Laszlo Agocs [Fri, 3 Jun 2011 12:01:49 +0000 (14:01 +0200)]
Remove out-of-date TODOs.
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().
Samuel Rødal [Fri, 3 Jun 2011 11:39:12 +0000 (13:39 +0200)]
Implemented QXcbIntegration::grabWindow().
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
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.
Samuel Rødal [Fri, 3 Jun 2011 08:00:03 +0000 (10:00 +0200)]
Get rid of superfluous debug output in the xcb plugin.
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.
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
Jørgen Lind [Wed, 1 Jun 2011 13:55:15 +0000 (15:55 +0200)]
Compile fix
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
Laszlo Agocs [Wed, 1 Jun 2011 13:32:58 +0000 (15:32 +0200)]
Have tooltips shown properly with 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.
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
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.
Laszlo Agocs [Wed, 1 Jun 2011 09:00:58 +0000 (11:00 +0200)]
Start using libxkbcommon in the xcb plug-in.
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.
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.
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.
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>
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>
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>
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>
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.
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
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
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
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>
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>
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.
Friedemann Kleint [Tue, 31 May 2011 09:11:43 +0000 (11:11 +0200)]
New configure.exe binary: Qt 5 with QT3_SUPPORT removed.
Friedemann Kleint [Tue, 31 May 2011 09:10:44 +0000 (11:10 +0200)]
configure.exe: Remove QT3_SUPPORT.
As it is causing compile problems.
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.
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
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
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>
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>
Laszlo Agocs [Mon, 30 May 2011 13:48:22 +0000 (15:48 +0200)]
Made QXcbConnection::atomName() more fail safe.
Reviewed-by: Samuel Rødal
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>
Friedemann Kleint [Mon, 30 May 2011 13:08:33 +0000 (15:08 +0200)]
Examples: QPA window example does not require widgets.
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
Lars Knoll [Mon, 30 May 2011 12:43:56 +0000 (14:43 +0200)]
compile with QT_NO_CUPS
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.
Lars Knoll [Thu, 26 May 2011 01:11:13 +0000 (03:11 +0200)]
correctly decode pasted text
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.
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.
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.
Lars Knoll [Sun, 22 May 2011 21:50:32 +0000 (23:50 +0200)]
Correctly define standard XA_FOO atoms
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
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
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
Laszlo Agocs [Mon, 30 May 2011 12:16:43 +0000 (14:16 +0200)]
Add focus and modal dialog support.
Reviewed-by: Samuel Rødal
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.
Morten Sorvig [Thu, 26 May 2011 12:36:15 +0000 (14:36 +0200)]
Compile on Mac.
Use the unix QPrinterInfo implementation.
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>
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>
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>
Laszlo Agocs [Fri, 27 May 2011 13:49:20 +0000 (15:49 +0200)]
Revert "Have subwindows parented properly."
This reverts commit
bb2986f165a51b0aee254c3e7217c3912c29e3f3.
Jiang Jiang [Fri, 27 May 2011 12:24:21 +0000 (14:24 +0200)]
Fix compile for systems with old fontconfig
Change-Id: Ia26796bdbab7988d14163d3c1290111c0cb22bf7
Reviewed-on: http://codereview.qt.nokia.com/182
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Laszlo Agocs [Fri, 27 May 2011 11:38:47 +0000 (13:38 +0200)]
Have subwindows parented properly.
Reviewed-by: Samuel Rødal
Liang Qi [Fri, 27 May 2011 11:34:28 +0000 (13:34 +0200)]
Add QUuid::toRfc4122() and fromRfc4122()
Following the RFC4122, provide the interfaces between QUuid
and QByteArray, they are simpler then toByteArray() and
relevant.
Thanks for the suggestion and brief code from Robin Burchell.
Task-number: QTBUG-19420
Reviewed-by: joao
(cherry picked from commit
06873e467d98ad60d827afae29500bf2ff783c03)
Change-Id: I4623ae3363f1d5affa45de73fac616bb67a9eaa1
Reviewed-on: http://codereview.qt.nokia.com/168
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Liang Qi [Fri, 20 May 2011 09:36:01 +0000 (11:36 +0200)]
Add QUuid::toByteArray() and relevant
Add QUuid::toByteArray() and QUuid(const QByteArray &). Same
behavior with QUuid::toString() and QUuid(const QString &).
Task-number: QTBUG-19419
Reviewed-by: joao
(cherry picked from commit
71f923f29e2c60444a85fc765fc582e06cb7eca4)
Change-Id: I41dad65e269f739ba9ec1c27e9da96af6401356c
Reviewed-on: http://codereview.qt.nokia.com/167
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Liang Qi [Fri, 20 May 2011 07:48:30 +0000 (09:48 +0200)]
QDataStream: speedup steaming of QUuid.
By reading and writing as a whole block, because the size of QUuid
is fixed.
Reviewed-by: joao
(cherry picked from commit
d56d7f107f9d18810d742ac4d3a2e36077722cb8)
Change-Id: I90554d68da7394c99c48acd0bc5a0eee3b3f7776
Reviewed-on: http://codereview.qt.nokia.com/169
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Liang Qi [Fri, 20 May 2011 10:45:56 +0000 (12:45 +0200)]
Optimize QUuid::QUuid(const char *)
Reviewed-by: joao
(cherry picked from commit
96d10abbb40c52ac6274f1144766f3fb27dfd726)
Change-Id: I050b602b6cac669b4d88046b0a707048ce0a8cda
Reviewed-on: http://codereview.qt.nokia.com/170
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Liang Qi [Mon, 23 May 2011 07:27:23 +0000 (09:27 +0200)]
Fix the build for QUuid
Add a quint8 specialization for qbswap.
Reviewed-by: Bradley T. Hughes
(cherry picked from commit
32a583b575da1b387955734ccf36b0a93de37670)
Change-Id: I7dae5e47565ed30de960983649e5c214e0303fe3
Reviewed-on: http://codereview.qt.nokia.com/171
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Friedemann Kleint [Mon, 23 May 2011 07:03:52 +0000 (09:03 +0200)]
uic: #include <QLayout> for QToolBox on non-laid-out forms.
for the fake tab-spacing property, which accesses the internal
layout and sets its spacing.
Task-number: QTBUG-19339
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Change-Id: I89f5c035bd3798a0998c3046de643bda0fa8da6b
(cherry picked from commit
89f5c035bd3798a0998c3046de643bda0fa8da6b)
Reviewed-on: http://codereview.qt.nokia.com/173
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Friedemann Kleint [Wed, 25 May 2011 09:27:40 +0000 (11:27 +0200)]
uic: Use QString::fromUtf8 for QUrl properties.
As otherwise the compilation of ui_-files fails when
using QT_NO_CAST_FROM_ASCII. Bug reported on mailing list.
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Change-Id: I00bf2e2605b97ff77efdcb68b7968375b3e9d195
(cherry picked from commit
00bf2e2605b97ff77efdcb68b7968375b3e9d195)
Reviewed-on: http://codereview.qt.nokia.com/174
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Liang Qi [Mon, 16 May 2011 08:48:05 +0000 (10:48 +0200)]
Fix a regression in QList::mid()
It doesn't need to copy anything when pos is after size().
Task-number: QTBUG-19164
Reviewed-by: Oswald Buddenhagen
(cherry picked from commit
8befc4982a32752e48c82cacbed045e7336a3569)
Change-Id: Iccac75842616f0d41e457e844a15d1a3ccfeb642
Reviewed-on: http://codereview.qt.nokia.com/164
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Liang Qi [Fri, 20 May 2011 12:12:57 +0000 (14:12 +0200)]
Add some autotests and benchmarks for QUuid
Missing those functions for optimization.
Reviewed-by: joao
(cherry picked from commit
4e9286880fd2686e61de2c4be3c317e01f0d9989)
Change-Id: I147e028f10cec7abc545dcbcca911d39a89d830e
Reviewed-on: http://codereview.qt.nokia.com/165
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Liang Qi [Fri, 20 May 2011 09:07:06 +0000 (11:07 +0200)]
Optimize QUuid::toString() and relevant
QUuid::toString() and QUuid(const QString &) are too slow now.
Task-number: QTBUG-19418
Reviewed-by: joao
Reviewed-by: Denis Dzyubenko
Reviewed-by: Ritt Konstantin
Reviewed-by: Robin Burchell
Reviewed-by: Richard J. Moore
(cherry picked from commit
7ce566ed82666ac08f137f4d8590ce589d42c82a)
Change-Id: I7e5bb4072f0941c20a7278a2d9766d4ef47be811
Reviewed-on: http://codereview.qt.nokia.com/166
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Rohan McGovern [Fri, 27 May 2011 03:53:09 +0000 (13:53 +1000)]
tests: fixed compile of tst_macgui
This test uses private headers. Mark it as such.
Change-Id: Icb6463629e1414b9da5403d0e0d766d8a113bd57
Reviewed-on: http://codereview.qt.nokia.com/160
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Rohan McGovern [Fri, 27 May 2011 04:31:11 +0000 (14:31 +1000)]
tests: fixed compilation of qstring benchmark on mac
On Mac, MAP_ANONYMOUS and MAP_POPULATE are not defined.
Fix MAP_ANONYMOUS by defining it to MAP_ANON.
Fix MAP_POPULATE by removing it, because its usage was unnecessary in
this code (the page was explicitly faulted in a few lines later anyway).
Change-Id: Iead82e1a949b35fe3c304d38babac8d4dc6f0769
Reviewed-on: http://codereview.qt.nokia.com/162
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Jason McDonald [Fri, 27 May 2011 03:00:08 +0000 (13:00 +1000)]
Make lexgen tests compile
Correctly declare that the tests depend on the Qt build having testlib.
Change-Id: Icf3332bc81a10e701316f1cd7021d2f6d3c2f424
Reviewed-on: http://codereview.qt.nokia.com/158
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 27 May 2011 03:20:52 +0000 (13:20 +1000)]
Use "QT += testlib" consistently
If a project uses "load(qttest_p4)" it doesn't need to add testlib to
the CONFIG or QT variables. If a project does not use
"load(qttest_p4)", it should add "testlib" to the QT variable.
Change-Id: If28353713ccdfe13612682e3e88dadebe2f2eefd
Reviewed-on: http://codereview.qt.nokia.com/159
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Gabriel de Dietrich [Thu, 26 May 2011 13:12:48 +0000 (15:12 +0200)]
Fix infinite recursion when changing geometry on Mac
Some complex widgets might get a negatively sized rectangle when
calling QWidgetPrivate:setGeometry_sys_helper(), triggering a infinite
recursion. Normalizing the rectangle size before checking for size
change is enough to break this infinite recursion.
Task-number: QTBUG-17333
Change-Id: I4682c3088ea53fb9f28f746c8264f573b5284825
Reviewed-on: http://codereview.qt.nokia.com/156
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Olivier Goffart [Fri, 20 May 2011 07:31:16 +0000 (09:31 +0200)]
Fix typo in comment
(cherry picked from commit
c8a3c427e96ee11907592f5c7f72046795c027ed)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/145
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-by: axis
Friedemann Kleint [Thu, 26 May 2011 15:25:27 +0000 (17:25 +0200)]
XCB: Fix moveToScreen to use QWindow instead of QWidget.
Olivier Goffart [Wed, 25 May 2011 13:05:35 +0000 (15:05 +0200)]
Added some of my Qt 4.8 changes to the changelog
Change-Id: I8913c88e5bd68145e0587d51ee9896fd5d21054a
Reviewed-on: http://codereview.qt.nokia.com/140
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Olivier Goffart [Wed, 20 Apr 2011 11:49:19 +0000 (13:49 +0200)]
MSVC do not really support initilizer_list
std::initializer_list exists, but it is not possible to do bracket
initialisation
Reviewed-by: Joao
(cherry picked from commit
a09f5c425079405e72078813bdb7b103c29a5221)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/143
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Olivier Goffart [Mon, 18 Apr 2011 12:07:32 +0000 (14:07 +0200)]
Support of lambdas in QtConcurrent::run
Reviewed-by: Joao
(cherry picked from commit
917f2ff617209bcc283eb3590b422bcf239c0537)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/142
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Olivier Goffart [Thu, 19 May 2011 12:43:53 +0000 (14:43 +0200)]
Add QtPrivate::QEnableIf
Needed for QtConcurrent.
Like the new std::enable_if (in c++0x)
Reviewed-by: Joao
(cherry picked from commit
837f18f043b18410c1d93b9f1156acf729dad510)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/141
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Olivier Goffart [Wed, 18 May 2011 15:55:43 +0000 (17:55 +0200)]
Tests for QtConcurrent::map using lambdas
Also disable tests with std::vector in c++0x as they do not compile
Reviewed-by: Joao
(cherry picked from commit
38d1b31006ecc83811bbb13e5a4182eac593a970)
Change-Id: I837f18f043b18410c1d93b9f1156acf729dad510
Reviewed-on: http://codereview.qt.nokia.com/144
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Shane Kearns [Fri, 13 May 2011 15:32:58 +0000 (16:32 +0100)]
Fix instability in QNetworkConfigurationManager autotest
QThread::isFinished() can return false after the finished() signal is
emitted, so test the event loop's timeout() function instead.
Don't compare prescan configurations, as these may be cached by the OS.
It was causing the test to fail on linux if run before any other network
test.
Reviewed-by: mread
(cherry picked from commit
e2320ec17446dc6e851fcf4ea2d998177b0d8049)
Change-Id: I35d67294871a35e2e63619f4acb0c3c32caa5eea
Reviewed-on: http://codereview.qt.nokia.com/137
Reviewed-by: Markus Goetz
Shane Kearns [Fri, 13 May 2011 15:19:18 +0000 (16:19 +0100)]
Fix thread safety regression of QNetworkConfigurationManager
Changes in 4.8 led to a timer being created in the wrong thread.
I have restored the invokeMethod used to call startPolling() to solve
this problem.
Reviewed-By: mread
(cherry picked from commit
e9e95f75e7c1e8325c2acce0087ff8677d773779)
Change-Id: I8b89fa89766679beb2d469f9bbd1f5e2233f061b
Reviewed-on: http://codereview.qt.nokia.com/138
Reviewed-by: Markus Goetz
Shane Kearns [Wed, 18 May 2011 14:08:53 +0000 (15:08 +0100)]
Update qhostinfo autotest to expect RFC5952 formatted ipv6 addresses
Test required updating due to
ebc134db484eee31491836b619aad1ee86e3070e
Reviewed-by: Martin Petersson
(cherry picked from commit
e46e32644720f0ddeb553b8a658c1711a4b5cdfb)
Change-Id: Idf3df633534a0d914bd22fd589a8c521eb426bc8
Reviewed-on: http://codereview.qt.nokia.com/139
Reviewed-by: Markus Goetz
shiroki [Wed, 25 May 2011 09:11:51 +0000 (11:11 +0200)]
fix "Host" header of ipv6 URLs in QNAM
Change-Id: I6bf3320e5ab285e3d1f4d72bd1ef0a0e42813e5b
Reviewed-on: http://codereview.qt.nokia.com/115
Reviewed-by: Markus Goetz
Marius Storm-Olsen [Wed, 25 May 2011 17:31:23 +0000 (12:31 -0500)]
Add QtTools' include/QtDesigner as well as QtCore's include/QtDesigner
In modularization QT+=uilib adds the QtCore specific include/QtDesigner,
while QT += designer adds the QtTools specific one.
Using !isEmpty(QT.<module/library>.name) is the proper way to check for
module/library existance in modularized Qt.
Change-Id: If1fe5d192129fd1cdbf43183b52327d7fa9c57ec
Reviewed-on: http://codereview.qt.nokia.com/126
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Jason Barron [Thu, 26 May 2011 09:52:31 +0000 (11:52 +0200)]
Add private header support to the EGLFS platform plugin.
Several of the QPA headers include private headers in the Core, Gui and
OpenGL modules and with the new modularized Qt, we need to opt-in for
these.
Change-Id: Ib7a81f7843ef89e3c5c5218f790287bb6c00e4cb
Reviewed-on: http://codereview.qt.nokia.com/133
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Rohan McGovern [Wed, 25 May 2011 23:19:38 +0000 (09:19 +1000)]
Fixed ordering problem when configuring with `-make <part>'
Prior to this change, running configure with the `-make' option would
affect the order in which parts of Qt are built. This is unintuitive
and would easily cause build failures. For example, configuring with
`./configure -make demos' would attempt to build demos before building
libs, which, of course, would fail.
Refactor the code so that the result is the same regardless of the order
of `-make' options.
Change-Id: Idfa61834a0f01d0628a9a1ae27ece94ae3647e6d
Reviewed-on: http://codereview.qt.nokia.com/128
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Friedemann Kleint [Thu, 26 May 2011 08:55:57 +0000 (10:55 +0200)]
Remove OpenVG from qtbase.
Acked-by: Samuel Rødal <samuel.rodal@nokia.com>
Jason McDonald [Mon, 23 May 2011 07:08:04 +0000 (17:08 +1000)]
Remove the redundant QTEST_ACCESSIBILITY define.
QTEST_ACCESSIBILITY was always defined and only used in one autotest.
Code that uses accessibility features should be excluded if Qt was built
without accessibility rather than based on a define in the test
framework.
Change-Id: I3a517a579a51f536a0983b43bd99e86292026552
Reviewed-by: pending
Reviewed-on: http://codereview.qt.nokia.com/129
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Friedemann Kleint [Thu, 26 May 2011 07:19:18 +0000 (09:19 +0200)]
Compile fix Linux.
Olli Werwolff [Wed, 25 May 2011 08:11:58 +0000 (10:11 +0200)]
Compile fix for QtGui when configure with -qpa on Windows
Reviewed-by: Friedemann Kleint
Olli Werwolff [Wed, 25 May 2011 07:52:25 +0000 (09:52 +0200)]
Declaration of QEventDispatcherWin32Private in private header file
As the class will be used as a base class for QEventDispatcherQPA
its declaration has to be accessible from there.
Reviewed-by: Friedemann Kleint
Kim Motoyoshi Kalland [Wed, 25 May 2011 15:03:59 +0000 (17:03 +0200)]
Fix for compiling and running cube example on Windows.
Change-Id: I0bf933fe81e332c03a81874cb371fa423634621b
Reviewed-on: http://codereview.qt.nokia.com/125
Reviewed-by: David Boddie
Jiang Jiang [Wed, 11 May 2011 14:56:24 +0000 (16:56 +0200)]
Fix QGLWidget::renderPixmap for raster engine on Mac
The QPixmap buffer is backed by QRasterPixmapData instead of
QMacPixmapData for the raster engine, thus we have to update
qt_mac_pixmap_get_base() and qt_mac_pixmap_get_bytes_per_line(),
so that QGLWidget can locate the offscreen buffer from a QPixmap.
Reviewed-by: Fabien Freling
(cherry picked from commit
c5846314dfd80e7f7f32ba737f1884dcccbbd80d)
Change-Id: I2414222f8a59e02c778177d52ad9a6e0ff68668d
Reviewed-on: http://codereview.qt.nokia.com/123
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Jiang Jiang [Mon, 16 May 2011 08:20:54 +0000 (10:20 +0200)]
Workaround a bug in Core Text to select Light fonts
Currently in Core Text there is not proper way to select fonts with
Light weight, for example:
QFont font("Helvetica"); font.setWeight(QFont::Light);
will give you Helvetica-Light, as with:
QFont font("Helvetica"); font.setWeight(QFont::Normal);
because of a bug in Core Text, applying 0 symbolic traits with
CTFontCreateCopyWithSymbolicTraits will always return the Light
variant of that font family. Thus, we should only do this unless
symbolicTraits is not 0 or font.weight is not Normal (Light is not
a symbolic trait, but CT doesn't support selecting Light weight
numerically).
Reviewed-by: Eskil
(cherry picked from commit
4d5b8f66d82e9087d9d58a4e76e6b46ce7bb53cc)
Change-Id: I37a970aba5019a13b9f3bc43b7fb594b74a1aa37
Reviewed-on: http://codereview.qt.nokia.com/124
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Lasse Holmstedt [Wed, 25 May 2011 09:24:37 +0000 (11:24 +0200)]
Add authentication token support for wayland windows
For compositors that support it, the wayland clients can associate themselves
with an auth token, specified by WL_AUTHENTICATION_TOKEN env var, or by
directly specifying it in the wayland client plugin.
Change-Id: I74a50a27c7c61c2b2cf1e09868618f36edc94cb1
Reviewed-by: Samuel Rødal
Reviewed-on: http://codereview.qt.nokia.com/116
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>