profile/ivi/qtbase.git
11 years agoQMimeDatabase: remove deprecated API
David Faure [Mon, 19 Nov 2012 13:54:37 +0000 (14:54 +0100)]
QMimeDatabase: remove deprecated API

c241d8921ea6384c30a1731a036aec8edc7609ab renamed the methods but kept
the old ones "for a week or two" at Thiago's request.

Change-Id: I0747c032b549e45f6c8201db577d84863f39f599
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
11 years agoUse setImage workaround on all OS X versions.
Morten Johan Sørvig [Fri, 16 Nov 2012 06:09:03 +0000 (07:09 +0100)]
Use setImage workaround on all OS X versions.

The painting bug that we are working around/fixing
here has been observed on 10.7 as well.

Change-Id: Ic29421bcc84405afa085af2f0ed2bc554c684f98
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoSQL: Fix OCI driver's compile errors.
Caroline Chao [Thu, 15 Nov 2012 08:58:32 +0000 (09:58 +0100)]
SQL: Fix OCI driver's compile errors.

Task-number: QTBUG-27979

Change-Id: I4ae4cdba855c05bc6fab0f845ff16a96c8119fdb
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoFixed memory leak in assign operator of QGLBuffer
Vadim Zakondyrin [Sat, 17 Nov 2012 03:39:14 +0000 (10:39 +0700)]
Fixed memory leak in assign operator of QGLBuffer

Change-Id: Icb51dd5a567483b415ab0e8af9eb62221225890d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFixed memory leak in assign operator of QOpenGLBuffer
Vadim Zakondyrin [Sat, 17 Nov 2012 03:10:51 +0000 (10:10 +0700)]
Fixed memory leak in assign operator of QOpenGLBuffer

Change-Id: I47f9128b54770bae7a63f82bf66ca16144b67c55
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQLocale: replace hard-coded default country-for-language map
Konstantin Ritt [Mon, 19 Nov 2012 17:12:58 +0000 (19:12 +0200)]
QLocale: replace hard-coded default country-for-language map

...with a generated one in a way similar to what
http://www.unicode.org/reports/tr35/#Likely_Subtags suggests.
The supplemental/likelySubtags.xml contains all the required data.
This changes some default countries to a most-expected ones.

Change-Id: I920a5623601d8661a943e78197d3bcc838191483
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoDocument what the QMimeDatabase constructor really does.
David Faure [Mon, 19 Nov 2012 13:10:33 +0000 (14:10 +0100)]
Document what the QMimeDatabase constructor really does.

Change-Id: I8d4dcc92296163dea7b78fbb0ceefaee08e57a94
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Allan Sandfeld Jensen <kde@carewolf.com>
11 years agoQSystemTrayIcon/X11: Use display obtained as native screen resource.
Friedemann Kleint [Mon, 19 Nov 2012 12:37:45 +0000 (13:37 +0100)]
QSystemTrayIcon/X11: Use display obtained as native screen resource.

Previously, the screen name was used, which contained the
display name. This was changed to return the xrandr-name.

Task-number: QTBUG-5416
Change-Id: I560143d6d459a8051c9640079cf7d39a3caebfec
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoAdd QPlatformNativeInterface::nativeResourceForScreen().
Friedemann Kleint [Mon, 19 Nov 2012 12:36:30 +0000 (13:36 +0100)]
Add QPlatformNativeInterface::nativeResourceForScreen().

Task-number: QTBUG-5416
Change-Id: Ic163a5ff1c7a06869d324acb9aa7c257a0262e72
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoAdd a new location for QML 2.x imports
Thiago Macieira [Mon, 15 Oct 2012 20:23:13 +0000 (13:23 -0700)]
Add a new location for QML 2.x imports

This commits adds a -qmldir configuration option for the configures to
allow the user to change the default location (it defaults to
$archdatadir/qml).

It adds a QLibraryInfo::Qml2ImportsPath value for
QLibraryInfo::location, a qmake property of QT_INSTALL_QML and a qt.conf
configure location entry "Qml2Imports".

At the same time, it makes the qmake .prf files dealing with QML plugins
be the QML 2 version. Those files are new in Qt 5, so we have the option
to choose which version we want to use.

Discussed-on: http://lists.qt-project.org/pipermail/development/2012-October/007136.html
Change-Id: I8c1c53e8685a5934ed0a9a42ba5663297b81a677
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoMinGW: Don't add version number '0' to the library name
Kai Koehne [Mon, 19 Nov 2012 09:19:57 +0000 (10:19 +0100)]
MinGW: Don't add version number '0' to the library name

This fixes linking on MinGW after the library renaming, and is also
in line with the logic in the nmake generator.

Change-Id: Ie25ce6c1d2b8f292c4e454db1cad9bcbbee7a05d
Suggested-by: Erik van Pienbroek
Task-number: QTBUG-27137
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoCompile with -no-widgets.
Morten Johan Sorvig [Wed, 17 Oct 2012 12:23:32 +0000 (14:23 +0200)]
Compile with -no-widgets.

Remove QApplication usage in qcocoasystemtrayicon.mm

Move qt_mac_cg_context from qpaintengine_mac.mm to
qcocoahelpers.mm to make it available in no-widgets
builds.

(Move qt_mac_colorSpaceForDeviceType as well; color
space support needs to be cleaned up later on.)

Change-Id: I724fdb09538d65eae56c26165f3ba53b6814ea78
Reviewed-by: Liang Qi <liang.qi@digia.com>
11 years agoRemove obsolete Mac mkspecs.
Morten Johan Sorvig [Fri, 12 Oct 2012 12:13:21 +0000 (14:13 +0200)]
Remove obsolete Mac mkspecs.

Project Builder was replaced with Xcode in Mac OS 10.3.
The xlc compiler is not in use on OS X any more.

Change-Id: Ie9150243cf5594a70f692a6841ee8221a2fa9ddb
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
11 years agoFix error reporting in TDS SQL driver.
Aaron McCarthy [Thu, 8 Nov 2012 05:13:10 +0000 (15:13 +1000)]
Fix error reporting in TDS SQL driver.

The error and message handlers used by the freetds library were getting
reset to back to the default every time a database was opened.  The
Qt TDS SQL driver was calling dbinit() from QTDSDriver::open().  This
had two problems:

1. dbinit() would reset the error handler previously set by a call to
   dberrhandle().  A db error would then cause the application to
   abort.
2. freetds expects dbinit() and dbexit() to be called symmetrically.
   Opening multiple database connections would result in freetds not
   cleaning up on application close.

Solved by moving the dbinit() call into the QTDSDriver constructor.

Change-Id: I59018d83238672c903b96a4d7f3f21b664c3ff4c
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoFix msvc2010 compiler warnings of switch with default but no case labels
Thiago A. Correa [Wed, 14 Nov 2012 02:40:22 +0000 (00:40 -0200)]
Fix msvc2010 compiler warnings of switch with default but no case labels

Change-Id: I5de4d7405131314c4e2bdb1222d2bb1a2d34a993
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agofix namespaced build
Oswald Buddenhagen [Fri, 16 Nov 2012 16:21:22 +0000 (17:21 +0100)]
fix namespaced build

Change-Id: I7ac3f3dc2057914108876241883cf8c7e30d2c33
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agomake qt_tool support building bootstrapped tools
Oswald Buddenhagen [Thu, 15 Nov 2012 13:49:19 +0000 (14:49 +0100)]
make qt_tool support building bootstrapped tools

as a "side effect", this fixes the build of bootstrapped tools when
doing a debug build under msvc: qt.prf would add CONFIG+=release after
default_post.prf already loaded debug.prf.

Change-Id: Idd17cf28d358950fd90bb18ca7a8d67e06953bc1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoremove pointless TARGET assignments
Oswald Buddenhagen [Thu, 15 Nov 2012 13:49:10 +0000 (14:49 +0100)]
remove pointless TARGET assignments

TARGET defaults to the project file's basename

Change-Id: I0cd204ae6559e6c51d3c987bc38ae372e2b4a3dd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoMinGW: Add missing constants for float control.
Friedemann Kleint [Thu, 15 Nov 2012 12:53:31 +0000 (13:53 +0100)]
MinGW: Add missing constants for float control.

Change-Id: Ibce64ed1ec2809551b0cd334b53b33ed445f90f7
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoconfigure.exe: add inotify auto detection support
Rafael Roquetto [Wed, 14 Nov 2012 16:33:16 +0000 (14:33 -0200)]
configure.exe: add inotify auto detection support

This patch complements already existing functionality in the configure shell
script.

Change-Id: I09f4875cbe7ec60d36bb33774d28944a34cc8470
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoAccept subsequent drag moves in QWidgetWindow if enter was accepted.
Friedemann Kleint [Fri, 16 Nov 2012 09:36:49 +0000 (10:36 +0100)]
Accept subsequent drag moves in QWidgetWindow if enter was accepted.

Add handling similar to QGuiApplicationPrivate::processDrag.

Task-number: QTBUG-28008
Change-Id: I516531da242471cdfbb59418d0052b25f799f373
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoRemove qSort from QCollator docs
Giuseppe D'Angelo [Fri, 2 Nov 2012 10:20:39 +0000 (11:20 +0100)]
Remove qSort from QCollator docs

Change-Id: I4523b7e4cd2a7f9e07a39e48e8024ceb0d7eb839
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
11 years agoRemove qSort from QList/QSet docs
Giuseppe D'Angelo [Fri, 2 Nov 2012 10:17:57 +0000 (11:17 +0100)]
Remove qSort from QList/QSet docs

Change-Id: I82ac7cafbda3bb6d54a0ba26903ab11113640067
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
11 years agoFix QStringList::sort test
Giuseppe D'Angelo [Fri, 2 Nov 2012 10:13:15 +0000 (11:13 +0100)]
Fix QStringList::sort test

Checking that the result of sort() is a specific list is wrong,
as sort() can put equivalent elements in an arbitrary order.

Change-Id: Ib06399cdecedb6cf01e721d4d92048449d66b40d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix QMutex::tryLock timeout computation on Linux
Olivier Goffart [Thu, 15 Nov 2012 17:16:30 +0000 (18:16 +0100)]
Fix QMutex::tryLock timeout computation on Linux

The timeout is in millisecond. So we just need to divide by 1000 to get
the number of seconds

Regression introduced in f587e8f4fd670f11fa1e878c1015d7241033559a
Reported in the comments of QTBUG-24795

Change-Id: Id16e05e7d04d33605860926f7516d14cdefd6a36
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix incorrect size hint for abstract spinbox
Jens Bache-Wiig [Thu, 15 Nov 2012 16:38:29 +0000 (17:38 +0100)]
Fix incorrect size hint for abstract spinbox

This size hint was based on strange logic from an alternate
universe. The size hint should only contain the text size
and let the style add what is neccessary for the frame rect etc.
Most styles have worked around this by simply ignoring it,
however some styles could still break a bit.

Note that we add 4 since that is the constant that the old
code 'usually' ended up at and should be compatible with
our existing styles.

Change-Id: Iebdbcb8949dd8b7daa7d8cb96ae5ab7351e4f79d
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoMissing break in case QEvent::WindowStateChange.
Miikka Heikkinen [Thu, 15 Nov 2012 13:36:18 +0000 (15:36 +0200)]
Missing break in case QEvent::WindowStateChange.

The missing break causes state change event handling to fall through
to tablet event handling, which is clearly wrong.

Change-Id: If19d7b3f794b3614961b9e79952331b0ede1fba1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoDisable static contents optimization for now.
Samuel Rødal [Wed, 14 Nov 2012 15:23:46 +0000 (16:23 +0100)]
Disable static contents optimization for now.

Since none of the platform backingstore implementations currently
implement this, skip trying to use the optimization for now to avoid
graphical glitches.

Task-number: QTBUG-27971
Change-Id: Ic6d263bb552ef0b4786910d71f965d26d810b7eb
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoAdd feature to enable rounded line edit on mac
Jens Bache-Wiig [Thu, 15 Nov 2012 16:04:18 +0000 (17:04 +0100)]
Add feature to enable rounded line edit on mac

This will not currently be exposed in the widget API but we
can make use of it for qt quick components.

Change-Id: I08300a3bcd58e68df633fe9b36a988eb6176ef9c
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoImprove highligted colorization on mac with Fusion style
Jens Bache-Wiig [Thu, 15 Nov 2012 15:45:04 +0000 (16:45 +0100)]
Improve highligted colorization on mac with Fusion style

This mimics the platform behavior of using blue color when
the system palette is in use.

Change-Id: I9ad6a552614a3466a930ad5b28fc70d9343d2022
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoAccessibility: Add documentation
Frederik Gladhorn [Sat, 3 Nov 2012 21:29:38 +0000 (22:29 +0100)]
Accessibility: Add documentation

This keeps the docs as internal, but add
information about the events.

Change-Id: I9b961a946a6d799232a756a9ac874c0caf91ecbc
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoAccessibility Mac: Implement value interface
Frederik Gladhorn [Tue, 6 Nov 2012 12:28:17 +0000 (13:28 +0100)]
Accessibility Mac: Implement value interface

Change-Id: Iea6e3c69b220d35bddb1798ff991f8e67e1749e3
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoImplement EditableText accessibility for Mac.
Morten Johan Sorvig [Thu, 1 Nov 2012 11:59:11 +0000 (12:59 +0100)]
Implement EditableText accessibility for Mac.

Change-Id: Ibe03975bafc5a6a420b3bd69dfaa93dbf65c9958
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
11 years agoBring back -nograb/-dograb for debugging.
Friedemann Kleint [Wed, 24 Oct 2012 10:57:01 +0000 (12:57 +0200)]
Bring back -nograb/-dograb for debugging.

Task-number: QTBUG-27632

Change-Id: I4b59df01519af4684d9dbe6e4b6c18a5ebd9aeae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
11 years agoFix QApplication::primaryScreen() in Windows
Miikka Heikkinen [Wed, 14 Nov 2012 10:22:19 +0000 (12:22 +0200)]
Fix QApplication::primaryScreen() in Windows

QPlatformInterface::screenAdded() documentation specifies that first
added screen will be the primary screen, so we need to ensure that
the screen Windows reports as the main display gets added first.

Task-number: QTBUG-27988
Change-Id: Ibc17b05a6c37007ff749fb54ab62d47ffa40f8ac
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoAssign correct codes to QLocale::AnyCountry and AnyScript
Konstantin Ritt [Wed, 14 Nov 2012 16:09:02 +0000 (18:09 +0200)]
Assign correct codes to QLocale::AnyCountry and AnyScript

as their meaning, in fact, is unknown (or default) country/script.

Change-Id: Id75a70d4b33c2092de414f3ac357f6bcb627ba47
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoAdd a bunch of missed scripts
Konstantin Ritt [Wed, 14 Nov 2012 16:02:16 +0000 (18:02 +0200)]
Add a bunch of missed scripts

Change-Id: I078bf95cb50c7ef634f9f3133ab9f9d25439e4ef
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoAdd missing Bodo language introduced in CLDR 1.9.1
Konstantin Ritt [Wed, 14 Nov 2012 15:55:34 +0000 (17:55 +0200)]
Add missing Bodo language introduced in CLDR 1.9.1

Change-Id: I4feb6ba781299d65ff3bf2717f08a0ac7eae7928
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoMisc fixes to the QLocale data parser/generator
Konstantin Ritt [Wed, 14 Nov 2012 15:00:30 +0000 (17:00 +0200)]
Misc fixes to the QLocale data parser/generator

Change-Id: I01589eae4e48bc1f484d54277de8f18262ca8f31
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoRegression fix to QHeaderView::setDefaultSectionSize
Thorbjørn Lund Martsum [Fri, 9 Nov 2012 14:58:57 +0000 (15:58 +0100)]
Regression fix to QHeaderView::setDefaultSectionSize

When the sections has been resized we need to calculate new values
for the section start-positions. Otherwise we break visualIndexAt
and sectionPosition.

This fixes a regression introduced in
b800d8b94a7861ecf8853621f6556fca186fb5b7

Change-Id: I148dbf44f742208787ed59b70d82b8048d721e90
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoWindows: Fixed mouse events related to size grips
Oliver Wolff [Thu, 15 Nov 2012 10:34:09 +0000 (11:34 +0100)]
Windows: Fixed mouse events related to size grips

The code which was adapted from Qt4 seems not to work as expected on
current Windows versions. There are no additional mouse move events
after releasing the mouse button from the size grip.

One special behaviour in regards to SizeGrips here seems to be that
there is no WM_LBUTTONUP message but a WM_MOUSEMOVE received when
the mouse button is released from the size grip. Due to mouse event
handling in the Windows plugin that event triggers the desired mouse
release event so everything should be fine.

With the previous implementation the behaviour from the bug report
can be explained by the fact, that the mouseMove event is eaten in
qwindowsmousehandler and so the second mouse click isn't even
delivered. Basically the first click triggers the press event without
a release and the second click does not trigger a press but a release
event.

Task-number: QTBUG-27864

Change-Id: I987c6e01dec4a6b6189ed30959daf7a2fcc17df6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
11 years agoQHash: constify some QHashNode members
Giuseppe D'Angelo [Sat, 10 Nov 2012 16:32:49 +0000 (16:32 +0000)]
QHash: constify some QHashNode members

They're read-only member variables (key, hash value of the key)
set only in the ctors, or a "comparison" member function.
All of them can be constified.

Change-Id: Ifd9242577213f38439a4f998b678f5b05413ad21
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: João Abecasis <joao@abecasis.name>
11 years agoChange to enter/leave policy while grabbing.
Miikka Heikkinen [Fri, 9 Nov 2012 13:57:07 +0000 (15:57 +0200)]
Change to enter/leave policy while grabbing.

Sending enter and leave events to other windows than the grabbing
window is not logical. The policy should be that only the grabbing
window receives enter and leave events.

Changed the documentation accordingly and provided the necessary
changes to Windows implementation.

Also removed explicit leave event generation for widgets when
popup is opened as that is now redundant.

tst_QWidget::underMouse() test was changed to behave according to
new logic.

Task-number: QTBUG-27871
Change-Id: I127fb8685b4a4206d1a319f42cba491ec02bc8ca
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoAdd comment to resetCursorBlinkTimer to avoid accidental removal of it
Jan Arve Saether [Thu, 15 Nov 2012 10:29:04 +0000 (11:29 +0100)]
Add comment to resetCursorBlinkTimer to avoid accidental removal of it

Change-Id: Ied4c686ab5f4d4530d4d5ae3ce22c6b9ffc4c1de
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoAdd resetCursorBlinkTimer() back again.
Jan Arve Saether [Thu, 15 Nov 2012 10:10:55 +0000 (11:10 +0100)]
Add resetCursorBlinkTimer() back again.

Apparently it was used by QtQuick1

Change-Id: Ia0cf8535cbfed9b09e151b887c243fb173ca300a
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoFix mouse cursor behavior for QMainWindow splitters
Miikka Heikkinen [Tue, 13 Nov 2012 12:10:32 +0000 (14:10 +0200)]
Fix mouse cursor behavior for QMainWindow splitters

The cursor handling has changed in Qt5 somewhat, which made old cursor
logic for splitters invalid, causing the splitter resize cursor to
persist after hovering over splitter, as well as cursor flicker
during splitter drag.

Since the cursor is changed always in dispatchEnterLeave, CursorChange
event can now come for QMainWindow when cursor hasn't actually changed,
so we now check if the cursor is still our adjusted cursor before
updating the old stored cursor. We also ensure that our adjusted cursor
stays visible if cursor is in fact changed - the changed cursor will
be shown when we no longer need adjusted cursor.

Additionally, we skip cursor adjustments while we are dragging the
splitter to avoid cursor flicker, which is caused by splitter actually
moving asynchronously after the mouse event is handled.

Task-number: QTBUG-27970
Change-Id: Id9f6a0e9653563e09b883f21396de056a88f78a7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoANGLE: Invalidate client window area when resetting swap chain
Jonathan Liu [Thu, 15 Nov 2012 08:50:54 +0000 (19:50 +1100)]
ANGLE: Invalidate client window area when resetting swap chain

Resizing a window larger results in the newly exposed region being
invalidated but the old region is treated as valid. This can result in
the old region no longer updating. This has been observed on Windows 7
64-bit with Aero theme using NVIDIA GeForce GTS 250 and driver version
301.42. Invalidate the entire client window area when resetting the
swap chain so that it updates properly.

Upstream patch: https://codereview.appspot.com/6812076/

Task-number: QTBUG-27822
Change-Id: I0f5d2004576019458baee74c35e52f69b893a219
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoWindows: Fix autocapture for multiple buttons
Miikka Heikkinen [Thu, 15 Nov 2012 08:32:31 +0000 (10:32 +0200)]
Windows: Fix autocapture for multiple buttons

Automatic capture of mouse events on button press was released when
the first button was released, even if multiple buttons were pressed.
Changed it so that the capture is released when the last button is
released.

Task-number: QTBUG-28007
Change-Id: Icee59aacaf0ba947820c40cb7ede00193ff46a14
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoMac: add runtime check for not calling preferredScrollerStyle on 10.6
Teemu Katajisto [Tue, 13 Nov 2012 08:15:29 +0000 (10:15 +0200)]
Mac: add runtime check for not calling preferredScrollerStyle on 10.6

Task-number: QTBUG-27915
Task-number: QTBUG-27913
Task-number: QTBUG-27911

Change-Id: I1da49c5a1455b30335dec53921a35dc09cd27aa4
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoQMimeDatabase: Fix handling of duplicate mimetype definitions.
David Faure [Mon, 22 Oct 2012 10:42:05 +0000 (12:42 +0200)]
QMimeDatabase: Fix handling of duplicate mimetype definitions.

When both freedesktop.org.xml and kde.xml define text/x-qml (*.qml),
the XML provider would look up *.qml, see two mimetypes, and treat that
as a glob conflict, and proceed with contents-based-determination,
which for this sample file, would find "C source" due to the C comment.

Fixed by ignoring duplicate pattern-mimetype associations.

The binary-cache provider doesn't have this problem, update-mime-database
already filters out duplicates when generating the on-disk extension tree.

Change-Id: Ie335b0b419e7413fa0550779709513f68c2bfc68
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoWidgets: Stop cursor blink timer when QLineEdit is read-only
Gabriel de Dietrich [Wed, 14 Nov 2012 09:52:16 +0000 (10:52 +0100)]
Widgets: Stop cursor blink timer when QLineEdit is read-only

This prevents unnecessary updates, since the cursor is not visible.

Change-Id: Iec54ed338a0cb526a03cd611de4d823e26f3d804
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoCocoa: application menu items sometimes get duplicated
Richard Moe Gustavsen [Wed, 17 Oct 2012 13:14:03 +0000 (15:14 +0200)]
Cocoa: application menu items sometimes get duplicated

Under some circumstances, the same menu item appears several times
in the application menu in the menu bar. This can be seen in Qt creator,
where "About Qt Creator" appears twize.

The reason is that QCocoaMenu::syncMenuItem does not take into account
that merged items cannot be found in the QCocoaMenu that owns the
menuItem, but rather inside the application menu. And because of this,
it fails cleaning up the old item when it changes from e.g
TextHeuristicRole to ApplicationRole.

This patch will fix this.

Change-Id: Ia84f552d1788d80d778c7dded3393412b9d2d8cb
Reviewed-by: Chris Meyer <cmeyer1969@gmail.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoqtAddModule(): define PRE_TARGETDEPS for static modules
J-P Nurmi [Tue, 13 Nov 2012 13:17:32 +0000 (14:17 +0100)]
qtAddModule(): define PRE_TARGETDEPS for static modules

This ensures that for example the platform plugins get properly
re-linked when the static platform-support lib changes.

Change-Id: Iad493d4de30d6f6977f80aa56d0b27d05e9e3770
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoSend enter to the child at the position of the QEnterEvent.
Friedemann Kleint [Thu, 8 Nov 2012 11:45:08 +0000 (12:45 +0100)]
Send enter to the child at the position of the QEnterEvent.

This was apparently done so in each of the widget_<platform>.cpp
in Qt 4.8. This then causes the cursor to be updated in
dispatchEnterLeave() on Windows and Linux.

Task-number: QTBUG-27871
Task-number: QTBUG-27585
Task-number: QTBUG-26424
Change-Id: Idf14cd96ccb36f7c2607853ed8b0024c36a5413c
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
11 years agoAdded expose and configure event compression in xcb platform plugin.
Samuel Rødal [Mon, 12 Nov 2012 16:02:17 +0000 (17:02 +0100)]
Added expose and configure event compression in xcb platform plugin.

We had this in 4.x to prevend swamping the event queue and causing a lot
of needless processing of stale events.

Task-number: QTBUG-27734
Change-Id: I020fe44885569f5a68c07220fcb44bea3e138089
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoWindows: Fixed handling of key events containing ctrl modifier
Oliver Wolff [Tue, 13 Nov 2012 06:50:43 +0000 (07:50 +0100)]
Windows: Fixed handling of key events containing ctrl modifier

QKeyEvent::key() returned the wrong value if the ctrl modifier was used
in that key event. That was due to the fact that ToUnicode might not
return the correct code for these events/keyboard states. While it works
for alt+shift+= (us layout) and gives '+' as unicode value it just
claims that it cannot translate the given state for ctrl+shift+=. So if
the control modifier is used and ToUnicode return 0 toKeyOrUnicode
should try again without the control modifier.

Task-number: QTBUG-10781

Change-Id: I5eb9c200701b4c98a8089fc0ab1ebaa385dbeea8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoCocoa: QPrintDialog does not show/closes down immediatly
Richard Moe Gustavsen [Thu, 25 Oct 2012 13:28:07 +0000 (15:28 +0200)]
Cocoa: QPrintDialog does not show/closes down immediatly

This happends if an event loop recursion ends before
the native print dialog gets executed (in the same scope).

The reason is that the event dispatcher gets interrupted as the
first recursion ends. And (because of the big difference between
how AppKit implements modal windows compared to Qt) this sets a flag
in the dispatcher that gets handled on the next callback to
QCocoaEventDispatcher::processPostedEvents. This will tell
the dispatcher to break out of the current modal session.
But since it cannot detect that an alien (native) session is now
running, it closes down that session by accident instead.

While code can be written in the event dispatcher to detect this
problem, it ends up more clean to just work around the problem
from the native dialogs instead. This to avoid making the
dispatcher more complex than it already is. Native dialogs is
a bit messy already, and the work-arounds needed should be
isolated inside those components, and not inside the dispatcher.

Change-Id: Ibfde9db4c98401562e7628da1db18d6bed619245
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoDon't link QtGui to winspool.dll
Konstantin Ritt [Sat, 10 Nov 2012 09:07:36 +0000 (11:07 +0200)]
Don't link QtGui to winspool.dll

The printer support API has moved to printsupport module/plugins

Change-Id: I6fdc6c08e600d0f7cc8d79bef808227b54880904
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoRefactor create_cmake to re-use the computed stem.
Stephen Kelly [Sat, 10 Nov 2012 16:02:53 +0000 (17:02 +0100)]
Refactor create_cmake to re-use the computed stem.

Change-Id: I3b277316b1befbb57613b465fc5bbedc6b2305f7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agocomplain about empty $$TARGET
Oswald Buddenhagen [Fri, 9 Nov 2012 18:04:28 +0000 (19:04 +0100)]
complain about empty $$TARGET

this should be fatal, but so should be a lot of other conditions.

Change-Id: I0c2c0bb9590ea1e4d0eae76e29eda34915914217
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agodefine the module rpath in the installed module pri file
Oswald Buddenhagen [Wed, 7 Nov 2012 13:43:09 +0000 (14:43 +0100)]
define the module rpath in the installed module pri file

the fallback path wouldn't account for a sysroot. as there is no clean
way to implement that, rather remove the fallback alltogether and make
the rpath a mandatory part of modules.

Change-Id: I6f2bd6e36889be2f61e17a579174380aa3c6622d
Reviewed-by: Romain Pokrzywka <romain.pokrzywka@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix zero-duration animations running Backwards.
Andreas Aardal Hanssen [Mon, 12 Nov 2012 20:10:21 +0000 (21:10 +0100)]
Fix zero-duration animations running Backwards.

If you set the duration of any variant or property animation to 0,
its progress will be stuck at 1 (0..1), and its "end" value set on
the target object, after start() has been called. If you change the
direction of the animation to QAbstractAnimation::Backward, you
would expect the progress to be 0 after start. Instead it's still
1; the code seems to assume that if the duration is 0, the
progress must be 1 always.

The fix is that if the duration is 0, the direction is checked to
determine whether progress should be 0 (Backward) or 1 (Forward).

Task-number: QTBUG-27969
Change-Id: Ibeca084bbbce41df1dca7b7d96c15b6b54394996
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Thierry Bastian <thierryb@filewave.com>
Reviewed-by: Magne Zachrisen <mazachri@cisco.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoClean up styles.qdoc.
Mitch Curtis [Fri, 9 Nov 2012 18:02:34 +0000 (19:02 +0100)]
Clean up styles.qdoc.

Corrected all spelling and grammar mistakes and formatted values
properly.

Change-Id: Iecfa0126e532ab08f8b6c307b5c00dc046e77a2a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agotests: Mark tst_qfilesystemmodel as insignificant on Mac
Samuli Piippo [Thu, 8 Nov 2012 08:42:13 +0000 (10:42 +0200)]
tests: Mark tst_qfilesystemmodel as insignificant on Mac

Task-number: QTBUG-27890

Change-Id: I8af9f019c00d38551ce04b4cdb4bb895a61a50c5
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agoCocoa: fix window focus lost when opening combobox
Richard Moe Gustavsen [Tue, 23 Oct 2012 09:33:47 +0000 (11:33 +0200)]
Cocoa: fix window focus lost when opening combobox

In cocoa, saying that a panel accepts key events, will make it receive
key events, but also show it as the active window on screen. The former
we dont really have to care about, since Qt will take care of forwarding
events to the popup for us anyway, even when they target another window.
So the only reason to actually let a panel become key window, is when
we want it to become active. And for popups, we only want this to happend
for Tool windows.

Change-Id: Ic4e5058307c514cbe30174d2a2d4ca0f41c8f71f
QTBUG: 26598
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoQWidget: Move break statement to the right place
Gabriel de Dietrich [Mon, 12 Nov 2012 13:46:42 +0000 (14:46 +0100)]
QWidget: Move break statement to the right place

An InputMethodQuery event should NOT be transformed into a PolishRequest
if the receiving widget has no WA_InputMethodEnabled attribute set.

Change-Id: I0727c600f1eb68087cb9fbc25f6458aca5417693
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoAvoid duplicate entries in QGenericUnixTheme::themeNames()
J-P Nurmi [Mon, 12 Nov 2012 10:50:07 +0000 (11:50 +0100)]
Avoid duplicate entries in QGenericUnixTheme::themeNames()

Change-Id: I6dc258274dc6614f56f306c30c95fe20c14fdf89
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agotest: Remove Q_WS_X11 from tst_QTextScriptEngine
Konstantin Ritt [Fri, 26 Oct 2012 12:54:10 +0000 (15:54 +0300)]
test: Remove Q_WS_X11 from tst_QTextScriptEngine

remove private->public hack, make it build on all platforms;
replace homebrew testing code with QtTest based one

Change-Id: Iaed93fd21938620e58ae90189456df1b8061f2f5
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoevdevtouch: also use BTN_TOUCH with value == 0 to detect TouchPointReleased
Jon Trulson [Fri, 2 Nov 2012 21:47:19 +0000 (15:47 -0600)]
evdevtouch: also use BTN_TOUCH with value == 0 to detect TouchPointReleased

The current code seems to rely on an event, ABS_MT_TOUCH_MAJOR with a
value of 0 to detect a touch release.  Not all devices[0] emit this, and
the spec[1] does not specify this behavior.

So, add a check for a BTN_TOUCH with a value of 0 to also indicate
Qt::TouchPointReleased.

[0]
http://www.chalk-elec.com/?page_id=1280#!/~/product/category=3094861&id=14647624
using hid_ntrig kernel module.

[1] https://www.kernel.org/doc/Documentation/input/multi-touch-protocol.txt

Change-Id: I4fc8ff404cad2083a57ff18737c5ea2b06d8ceac
Reviewed-by: Robert Daniels <robert.daniels@vantagecontrols.com>
Reviewed-by: Laszlo Agocs <lagocs83@gmail.com>
11 years agoFix a warning on compilers not supporting constexpr.
Jędrzej Nowacki [Wed, 7 Nov 2012 10:23:09 +0000 (11:23 +0100)]
Fix a warning on compilers not supporting constexpr.

Macros should call QSKIP instead of creating a semi-empty function body.

Change-Id: I389701f618fe9bf0a40aa26f161620389a80e407
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
11 years agoadd QLinkedList to bootstrap lib
Oswald Buddenhagen [Wed, 31 Oct 2012 10:32:24 +0000 (11:32 +0100)]
add QLinkedList to bootstrap lib

lrelease will need it.

Change-Id: I929d8eeb4c2d342aaf780a4c72283deb051a7bec
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoAdd -archdatadir and change some of the default install dirs in Qt 5.
Thiago Macieira [Mon, 24 Sep 2012 12:30:45 +0000 (14:30 +0200)]
Add -archdatadir and change some of the default install dirs in Qt 5.

Architecture-depedent Qt data defaults now to something under
-archdatadir. Architecture-dependent data is everything that contains
machine code (e.g., plugins) as well as anything that hardcodes
build-specific data, like qconfig.pri and qmodule.pri. That is:

  QML imports:    $archdatadir/imports     (includes plugins)
  Qt plugins:     $archdatadir/plugins     (machine code)
  Mkspecs:        $archdatadir/mkspecs     (build-specific)

Architecture-independent Qt data defaults now to something under
-datadir. This option existed in Qt 4, but did not differentiate between
arch-dependent and independent. Following Autoconf's lead, --datadir is
the *independent* data root.

  translations:   $datadir/translations    (.qm files are arch-independent)
  docs:           $datadir/doc

By default, both new options are equal to the Qt install prefix.

(Strictly speaking, for complete Autoconf compatibility, we'd need a
--datarootdir=$prefix/share, --datadir=$datarootdir/qt5 and
--docdir=$datarootdir/doc/qt5, but that's just nitpicking and
unnecessary)

Change-Id: I39c886a6a2d2d2c0b11923c50974179e21f2af76
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoAdd a QEnterEvent containing the mouse position.
Friedemann Kleint [Wed, 7 Nov 2012 15:23:32 +0000 (16:23 +0100)]
Add a QEnterEvent containing the mouse position.

Enter handling requires knowledge of the mouse
position. Extend the enter handling of
QWindowSystemInterface to receive the position
(implemented for Windows, XCB and Mac), passing it
on to QEnterEvent. Dispatch QEnterEvent from
widgets code.

Change-Id: I49c07d2b1f46310c877017dd55d4cd7d636bdbce
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoAdd warning about non-API in Qt5CTestMacros.
Stephen Kelly [Sat, 10 Nov 2012 15:20:48 +0000 (16:20 +0100)]
Add warning about non-API in Qt5CTestMacros.

The macros are only for tests in Qt itself, and will be changed without
restriction.

Change-Id: I4cf5b8559be510f01d0122c59492c5ea3e71c8d3
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoRefactor and cleanup QGtk(2)Painter
J-P Nurmi [Wed, 7 Nov 2012 11:54:53 +0000 (12:54 +0100)]
Refactor and cleanup QGtk(2)Painter

Move all the GTK2 specific function resolving and painting routines
to QGtk2Painter. A GTK3 specific and Cairo based QGtk3Painter will
be introduced later, and it will be QGtkStyle's job to choose
between the two.

Change-Id: I2c8a85de0cf8187468798cf5faff0006da4b9623
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoAdd the GCC 4.8 C++11 feature list
Thiago Macieira [Fri, 9 Nov 2012 12:08:35 +0000 (13:08 +0100)]
Add the GCC 4.8 C++11 feature list

This list is current at the time of writing. Since GCC 4.8 hasn't
finished development, it may still change before the final 4.8.0
release.

Change-Id: Ie4a6809bc6680cafcdd0c7a6a2fd6f8be790c8d2
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoInsert the Qt major version (5) in the library names
Thiago Macieira [Tue, 16 Oct 2012 02:45:16 +0000 (19:45 -0700)]
Insert the Qt major version (5) in the library names

As discussed on the mailing list, insert the Qt major library version in
the library name, so even the development files can be co-installed with
Qt 4.

Discussed-on: http://lists.qt-project.org/pipermail/development/2012-September/006545.html
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-September/006551.html
Change-Id: If0be11ebf9454a9fb6d96cda161790dfd53c00f5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agodelete -prefix-install configure option
Oswald Buddenhagen [Wed, 7 Nov 2012 13:29:26 +0000 (14:29 +0100)]
delete -prefix-install configure option

the only thing -no-prefix-install did was changing the install path
defaults on mac. and the result didn't work particularly well.

Change-Id: Iadd0f4b494b6920b595e184f858ef810f5222b0c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoQTBF: Remove StartOfItem/EndOfItem enum values
Konstantin Ritt [Sun, 28 Oct 2012 19:13:02 +0000 (21:13 +0200)]
QTBF: Remove StartOfItem/EndOfItem enum values

Since the behavior of boundaryReasons() method has been changed a lot,
remove the StartWord/EndWord enum values to force the affected code be revised;
StartOfItem/EndOfItem must be used instead.

Change-Id: I3d1d97d2dbe9680d290646d8c3adb5558ca26bd7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoAdded private header warnings in src/gui/kernel
Samuel Rødal [Fri, 9 Nov 2012 12:14:33 +0000 (13:14 +0100)]
Added private header warnings in src/gui/kernel

Change-Id: If3ad9d1e18543639f9e6abb8899b72772bc70c83
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoAdded motion event compression in xcb plugin.
Samuel Rødal [Fri, 9 Nov 2012 17:16:04 +0000 (18:16 +0100)]
Added motion event compression in xcb plugin.

We did this in 4.8 too, to avoid swamping the event queue with stale
motion events. If you're interested in fine grained motion events you
just need to have a responsive main loop. Most applications are only
interested in the latest mouse position in any case.

Fixes performance issues in QML where an onMouseXChanged or
onMouseYChanged in a mouse area does directly or indirectly runs some
heavy computations, slowing rendering to a halt since the main loop is
constantly busy.

Change-Id: I169c96458db4d57b689d6c2c915765b11c35e123
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoMac: More accurate focus mask
Gabriel de Dietrich [Fri, 9 Nov 2012 14:41:08 +0000 (15:41 +0100)]
Mac: More accurate focus mask

Small artifacts were visible when tabing in and out QLineEdits several times.

Change-Id: I56334e0534c67c94d357e3517d2470adcc1d8a1c
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoFix GIF image decoding: do not zero transparent pixels
aavit [Wed, 7 Nov 2012 14:19:20 +0000 (15:19 +0100)]
Fix GIF image decoding: do not zero transparent pixels

For the special transparent color index, the decoder would skip
writing anything out (thus leaving the pixels at 0 rgba value).
Although correct for later frames, for the initial frame this would
loose the color information for such pixels (which one otherwise
could have made visible e.g. by converting then image to an
alpha-less image format).

Change-Id: I316cefce8f21797feedebfbf98296ad84eaa4b99
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
(cherry picked from qt/c309d424f45dc0e7b62fbbbabf20dbfe355f48a7)
Reviewed-by: aavit <eirik.aavitsland@digia.com>
11 years agoQt5 updates to the QPainter lancelot autotest
aavit [Mon, 29 Oct 2012 09:34:20 +0000 (10:34 +0100)]
Qt5 updates to the QPainter lancelot autotest

a) Use the new Qt5 OpenGL API for testing of GL painting
b) Simplify: Use the higher-level QBaselineTest API instead
of the low-level baselineprotocol API.

Change-Id: Ib5f47f6fe68837dfdc8dc3a74638c5cb0b724614
Reviewed-by: aavit <eirik.aavitsland@digia.com>
11 years agoFix warnings about unused variables in stylehelper.
Friedemann Kleint [Wed, 7 Nov 2012 13:56:59 +0000 (14:56 +0100)]
Fix warnings about unused variables in stylehelper.

Change-Id: I6f18fff5277a95301a525209b7d45f0d4f182b97
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoQNX: Don't crash on application exit.
Sergio Martins [Fri, 9 Nov 2012 08:25:48 +0000 (08:25 +0000)]
QNX: Don't crash on application exit.

Variable should be initialized in ctor so it doesn't crash
when deleting it.

Crashes with QNX SDP 6.5

Change-Id: I462f1e374f0588f29fe6fc14a957672467c9b2f7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agotest: fix tst_QLocale::macDefaultLocale
Liang Qi [Fri, 9 Nov 2012 04:11:34 +0000 (05:11 +0100)]
test: fix tst_QLocale::macDefaultLocale

1. There is a behaviour change for CFDateFormatterGetFormat() between
10.6 and later, QLocale::dateFormat(QLocale::LongFormat) will return
"MMMM d, yyyy" for 10.6 and "MMMM d, y" for 10.7, 10.8
2. Add a comment for toCurrencyString() test, need another system
settings

Task-number: QTBUG-27790
Change-Id: I4fe684d6e0c1d4a140e3b1f1ef395b7fdad030b4
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoSupport native event filter for Mac OS X
Liang Qi [Thu, 18 Oct 2012 09:15:25 +0000 (11:15 +0200)]
Support native event filter for Mac OS X

Ported from Qt 4 implementation, updated with
QAbstractEventDispatcher::filterNativeEvent() call.

Tested with an example.

Change-Id: I3271f8a565d06d80b7b48ba81728bcdb7b1c32e3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agofix binding of bool type in mysql driver
Mark Brand [Tue, 30 Oct 2012 09:51:25 +0000 (10:51 +0100)]
fix binding of bool type in mysql driver

MYSQL_TYPE_TINY should be used for binding bool input value.
MYSQL_TYPE_LONG might be too big for bool, resulting in bools being
saved in the database as int 127. The problem was not specific to
the vendor's BOOL column type.

http://dev.mysql.com/doc/refman/5.0/en/numeric-type-overview.html
http://dev.mysql.com/doc/refman/5.0/en/c-api-prepared-statement-type-codes.html

Added generic autotest to make sure that binding bool works. All
drivers should pass this test.

Task-number: QTBUG-27763
Change-Id: I4e69f8e3b32fffb702ec9fa8a80ff5c50dea954b
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
11 years agoSave grayscale palleted images to grayscale png
Sergey Borovkov [Sat, 27 Oct 2012 14:17:05 +0000 (18:17 +0400)]
Save grayscale palleted images to grayscale png

While Qt does not support grayscale images explicitly it makes sense to
save palleted images to grayscale png when possible for better
compression and compatibility as opening and saving grayscale images now
converts them to palleted

Change-Id: Iab7c5a5a9d24b9352f5a7bafe04824a97d2463d9
Reviewed-by: aavit <eirik.aavitsland@digia.com>
11 years agoSimplify and speed up OpenGL framebuffer grabbing.
aavit [Tue, 6 Nov 2012 08:26:09 +0000 (09:26 +0100)]
Simplify and speed up OpenGL framebuffer grabbing.

If possible, let glReadPixels() itself provide the pixel format
that QImage requires, so we can drop the pixel manipulation afterwards.

Change-Id: I6c9226003c15d49548fa00696f31d0b2e26c0783
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoQGtkStyle: GTK3 compatible gtk_adjustment_new()
J-P Nurmi [Thu, 8 Nov 2012 18:04:32 +0000 (19:04 +0100)]
QGtkStyle: GTK3 compatible gtk_adjustment_new()

In GTK3, gtk_adjustment_new() returns GtkAdjustment* and there's no
such thing as GtkObject anymore. Just typedef the function pointer
appropriately and as a bonus we'll save ourselves from the casts. ;)

Change-Id: I2f17ab10b835dd0bffabb86345488e84aea51f3c
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoReport threaded rendering support in xcb when using event reader thread.
Samuel Rødal [Wed, 7 Nov 2012 15:20:20 +0000 (16:20 +0100)]
Report threaded rendering support in xcb when using event reader thread.

Threaded rendering had issues due to bugs in xcb before
xcb_poll_for_queued_event() was added. Now xcb_poll_for_queued_event()
is resolved at runtime and if present xcb events are received on a
separate thread.

Change-Id: I05420c8c9f9a20f41ce0f86ed255bc8b295e7fe5
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoReturn appropriate currentContext() in platform's makeCurrent().
Samuel Rødal [Mon, 5 Nov 2012 14:55:49 +0000 (15:55 +0100)]
Return appropriate currentContext() in platform's makeCurrent().

This way the platform plugin can use convenience classes such as
QOpenGLFramebufferObject in the makeCurrent() implementation.

Change-Id: I1fb5f6b8ec094ff39454adbeca9eb0d1a8f43ee6
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoQFutureInterface: Remove unused function
Orgad Shaneh [Thu, 8 Nov 2012 14:11:00 +0000 (16:11 +0200)]
QFutureInterface: Remove unused function

Following 731ba8ed08f80644b403556638c7f6229e678ebe this function is
not used anymore

Change-Id: Id908931b4b21c825bd80a4f03790630818c73c07
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
11 years agoCleanup old signal handler mechanisms
Rafael Roquetto [Thu, 8 Nov 2012 13:11:40 +0000 (11:11 -0200)]
Cleanup old signal handler mechanisms

Remove watchUnixSignal(), unixSignal() and associated code. These are relics
which were being used by QWS to detect virtual console switching. Currently
they are not being used at all. The recommended way to watch for Unix signals
in Qt is http://doc-snapshot.qt-project.org/5.0/unix-signals.html.

Change-Id: Id34207cb8853442302a45b2816356da0f973ebb1
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agotest: Mark tst_QLocale::macDefaultLocale as XFAIL
Samuli Piippo [Thu, 8 Nov 2012 10:51:41 +0000 (12:51 +0200)]
test: Mark tst_QLocale::macDefaultLocale as XFAIL

Task-number: QTBUG-27790
Change-Id: Ida33d9579df4ef35d0323546f4d89596e159cb8e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agoQAbstractProxyModel: fix sibling() reimplementation
Mark Brand [Thu, 8 Nov 2012 00:54:13 +0000 (01:54 +0100)]
QAbstractProxyModel: fix sibling() reimplementation

The previously missing mapFromSource() sets the proxy model in the
returned index. Otherwise, the returned index refers incorrectly to
the source model.

Follow-up to 9dfba89c28bbff3316cb7aed6c07f90c0f2d5a22 and
e5ac4fb9b236c782e3ed6f15044eb9956246931a
Change-Id: I25cd7baa4a93284ab14ede988ac524971870794e
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoImplement "-device" option for configure.exe
Rafael Roquetto [Wed, 17 Oct 2012 20:06:41 +0000 (17:06 -0300)]
Implement "-device" option for configure.exe

This aims to mimics the behavior of the -device option already present on the
configure shell script

Change-Id: Ia28306f5ed74b9cfa812aa3efa6b79d0bafa4994
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoadd (parts of) QtXml to the bootstrap lib
Oswald Buddenhagen [Wed, 31 Oct 2012 10:32:09 +0000 (11:32 +0100)]
add (parts of) QtXml to the bootstrap lib

we bootstrap it anyway (as qdoc already needed it). now lrelease will
also need it.

Change-Id: I5117634448368e18d6cf5540d678e039a66c7260
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>