qt:qtbase.git
3 years agoReport hardware acceleration in default manifest
Eskil Abrahamsen Blomfeldt [Wed, 4 Dec 2013 08:45:01 +0000 (09:45 +0100)]
Report hardware acceleration in default manifest

Qt applications require the "hardwareAccelerated" flag set on
some devices or Android versions. The symptoms that this was missing
was problems when handling orientation changes. When the target
SDK version is >= 14, it is true by default, but for lower versions
it is not. There is no reason to set this to false for a Qt
application, since we don't use any of the unsupported 2D drawing
operations in the documentation, so lets just set it to true for
all applications.

Task-number: QTBUG-35293
Change-Id: Ie131a52a2a3fc5a520d0c5dd5d64f79269e9b6b5
Reviewed-by: BogDan Vatra <bogdan@kde.org>
3 years agoRepack structs with more than one padding hole
Thiago Macieira [Mon, 30 Sep 2013 01:07:23 +0000 (18:07 -0700)]
Repack structs with more than one padding hole

Sizes gained (measured on 64-bit systems)
BezierEase: shrunk 8 bytes
QRegExpCharClass: shrunk 8 bytes
QRegularExpressionPrivate: shrunk 8 bytes
QTimeLinePrivate: shrunk 8 bytes
QUtcTimeZonePrivate: shrunk 8 bytes
QTextStreamPrivate: shrunk 8 bytes
QDirPrivate: shrunk 8 bytes
QFileDevicePrivate: shrunk 8 bytes

Not done:
QRegExpEngine: 18 bytes in 6 holes (you deserve high memory usage if
you're still using QRegExp)
QTextBoundaryFinder: 8 bytes in 2 holes (public class)
QIODevicePrivate: 6 bytes in 2 holes, but there's no gain in packing
QProcessPrivate: too complex and my copy is modified
QThreadData: awaiting change from Marc

Change-Id: I2a388b5ce17dec0dafcef18ed2e80d0379aa7d1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoxcb qpa: initialize EGL for non-XLib builds
Andrew Knight [Mon, 2 Dec 2013 09:15:31 +0000 (11:15 +0200)]
xcb qpa: initialize EGL for non-XLib builds

Move the EGL initialization code outside of the XLib ifdefs, so it
can be enabled for non-XLib builds as well

Change-Id: Ie025551e4e99bb0b365f025356bd9725f4283b82
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
3 years agoconfigure: Properly report xcb-xlib configuration
Andrew Knight [Thu, 28 Nov 2013 13:38:08 +0000 (15:38 +0200)]
configure: Properly report xcb-xlib configuration

d34cae51 introduced a new configuration parameter, xcb-xlib, but did not
remember to set the internal variable after the config test was run,
resulting in a potentially incorrect reporting of the option.

Change-Id: I979589d9aad2eb5e0fac069dfcd5b329a51ae059
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoEffects also need to markDirtyOnScreen for native widgets
Gunnar Sletta [Tue, 3 Dec 2013 12:00:47 +0000 (13:00 +0100)]
Effects also need to markDirtyOnScreen for native widgets

Task-number: QTBUG-33244
Change-Id: I95427b1fd6edaafe99738acfec28f6fd37b70cde
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
3 years agoUse case insensitive comparison when checking platform plugin keys.
Friedemann Kleint [Fri, 29 Nov 2013 11:35:52 +0000 (12:35 +0100)]
Use case insensitive comparison when checking platform plugin keys.

Change-Id: Iff44698dcc941ca244b476f0e6c6a993f2ad75f3
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
3 years agoDoc: invalid reference to Qt for Linux/X11
Nico Vertriest [Thu, 28 Nov 2013 13:04:14 +0000 (14:04 +0100)]
Doc: invalid reference to Qt for Linux/X11

Task-number: QTBUG-34749

Change-Id: I8274e41bc4c29650b22bb6ca5da264687aa70e4a
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
3 years agoDoc: fixed invalid reference
Nico Vertriest [Thu, 28 Nov 2013 13:03:01 +0000 (14:03 +0100)]
Doc: fixed invalid reference

Link to "Getting started with qmake" was invalid

Task-number: QTBUG-34749

Change-Id: I782dc99f5182f2fe7661377eb82f35ebb50a46cf
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
3 years agoavoid vcX0.pdb files for qmake
Oswald Buddenhagen [Thu, 21 Nov 2013 13:33:01 +0000 (14:33 +0100)]
avoid vcX0.pdb files for qmake

let the compiler use qmake.pdb, as the linker will.

Change-Id: Ifafdfeff5a7d0ea91d796f76fbdc018c87cf8b78
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agodon't install qt dlls into lib/ any more
Oswald Buddenhagen [Wed, 27 Nov 2013 16:58:02 +0000 (17:58 +0100)]
don't install qt dlls into lib/ any more

bin/ is entirely sufficient.

Change-Id: Id587e0e97b46aa977dae59baaea02ecc6e64a67a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agomake compiler use the project's pdb file
Oswald Buddenhagen [Mon, 18 Nov 2013 20:39:43 +0000 (21:39 +0100)]
make compiler use the project's pdb file

this avoids the nasty and conflicting vcXX0.pdb files in the build dirs.
VS will already do that.

Change-Id: I7bddaecf3f478edc78cd6654b5a1038db4fe04ff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agocomplete implementation of force_debug_info
Oswald Buddenhagen [Mon, 18 Nov 2013 20:39:08 +0000 (21:39 +0100)]
complete implementation of force_debug_info

that means further detaching the generation and installation of debug
info from the thing calling itself A Debug Build.

Task-number: QTBUG-32412
Change-Id: I4d79d1ae4806c8e4a2d6a7ccd030fb88385dd7d4
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agodisable incremental linking for release_with_debug_info builds
Oswald Buddenhagen [Mon, 18 Nov 2013 20:46:20 +0000 (21:46 +0100)]
disable incremental linking for release_with_debug_info builds

it's very unlikely that these artifacts will need rebuilding during a
debugging session (these pdbs are meant to support crash dump analysis).

Change-Id: Ia8138f9298355b402d8dd3f042f85b669693de64
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agoinstall pdb files also for executables
Oswald Buddenhagen [Mon, 18 Nov 2013 19:44:54 +0000 (20:44 +0100)]
install pdb files also for executables

the restriction to dlls is entirely unjustified.

Change-Id: Ia518dd16189572dea9e8f4280c88801b1393694e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agomake CONFIG+=no_dll affect pdb files as well
Oswald Buddenhagen [Mon, 18 Nov 2013 19:39:33 +0000 (20:39 +0100)]
make CONFIG+=no_dll affect pdb files as well

this option suppresses the installation of target (leaving only
dlltarget). however, it still installed target's pdb file.

Change-Id: Ia686a647c101ca66e74944d23171e120fc74515a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agoRespect the custom paper size settings on Mac
Andy Shaw [Sun, 1 Dec 2013 23:26:17 +0000 (00:26 +0100)]
Respect the custom paper size settings on Mac

When the user added a custom paper size then it would be silently
ignored when printing on Mac. This now ensures that it is respected when
appropriate.

[ChangeLog][Platform Specific Changes][OS X][QtPrintSupport] Respect
the custom paper size settings when printing.

Task-number: QTBUG-34700
Change-Id: I08afe24e0e67a50e9301abf4642c6f65bb0df1fe
Reviewed-by: John Layt <jlayt@kde.org>
3 years agoClear isOpenError flag on successful open call
Tobias Koenig [Mon, 2 Dec 2013 12:29:10 +0000 (13:29 +0100)]
Clear isOpenError flag on successful open call

Clear the isOpenError flag in IBase driver if the QIBaseDriver::open()
call was successful, otherwise a previous, unsuccessful open() call would
block any further QSqlQuery::exec() calls on this database connection.

Task-number: QTBUG-13435
Change-Id: Idc64e28cd63805a13f208702ec87dc1bf6b98798
[ChangeLog][QtSql][QIBASE] Fixed the internal state of IBase driver after a failed open call
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
3 years agoSupport custom port number in IBASE SQL driver
Tobias Koenig [Sat, 30 Nov 2013 19:22:28 +0000 (20:22 +0100)]
Support custom port number in IBASE SQL driver

Let the IBASE SQL driver use the custom port number
that is set via QSqlDatabase::setPort().

Task-number: QTBUG-33345
Change-Id: Ib55b32c8a318d82038d66e8645b416e36dad3edf
[ChangeLog][QtSql][QIBASE] Support custom port number
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
3 years agoFix compilation of OCI driver
Tobias Koenig [Sat, 30 Nov 2013 17:08:35 +0000 (18:08 +0100)]
Fix compilation of OCI driver

Add missing feature enum in switch statement to
avoid warning that would lead to compilation error
when compiled with -Wall.

Task-number: QTBUG-34794
Change-Id: Ia2f70f27ecbb7a7dfc9d36d261103ff49b6c5e4b
[ChangeLog][QtSql][QOCI] Fix compilation
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
3 years agoFix evaluation of SQLite driver options
Tobias Koenig [Sat, 30 Nov 2013 13:40:11 +0000 (14:40 +0100)]
Fix evaluation of SQLite driver options

Ensure that the options, which are passed to the SQLite driver, are
evaluated in the correct order and do not overwrite each other.
According to http://www.sqlite.org/c3ref/open.html the
SQLITE_OPEN_READONLY and (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE) are
mutual exclusive, but SQLITE_OPEN_URI can be combined with both of them.

Task-number: QTBUG-35186
[ChangeLog][QtSql][QSQLITE] Fixed evaluation of driver options
Change-Id: I8e74fe1ce43b9118b15f7b13fc71670bdcd73f68
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
3 years agoDetect posix_fallocate at configure time
Fatih Aşıcı [Mon, 11 Nov 2013 15:04:46 +0000 (17:04 +0200)]
Detect posix_fallocate at configure time

Testing feature macros is not enough for uclibc. Fixes build of the built-in
sqlite3 with uclibc <= 0.9.33.2. Later versions will have posix_fallocate().

Change-Id: I918a52777ac63624635802221effc6b86fa2269c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
3 years agoBlackBerry: properly clean up QFileDialog files
Rafael Roquetto [Thu, 28 Nov 2013 19:18:37 +0000 (17:18 -0200)]
BlackBerry: properly clean up QFileDialog files

Task-number: QTBUG-34983

Change-Id: I1af5c6a9c43eba77394b11d31d1d223af8bc221f
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
3 years agoBlackBerry: remove unused variable
Rafael Roquetto [Thu, 28 Nov 2013 13:52:51 +0000 (11:52 -0200)]
BlackBerry: remove unused variable

m_result is not used by qqnxfiledialoghelper_bb10.cpp, only by its playbook
counterpart.

Change-Id: I4fae924283560703393c5313527c5c9c2005d35b
Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
3 years agoBlackBerry: Fix QFileDialog show()/hide()
Rafael Roquetto [Thu, 28 Nov 2013 13:51:18 +0000 (11:51 -0200)]
BlackBerry: Fix QFileDialog show()/hide()

QFileDialog::show() no longer worked after the dialog had already been shown
and hidden before.

Task-number: QTBUG-34983
Change-Id: I7300374b74805308e0966db7b3545e5fd8470465
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
3 years agoqdbusxml2cpp: Use the mtime on the input XML to avoid needless source changes.
Robin Burchell [Thu, 28 Nov 2013 10:37:11 +0000 (11:37 +0100)]
qdbusxml2cpp: Use the mtime on the input XML to avoid needless source changes.

These can cause rebuilds unnecessarily when repeatedly running qdbusxml2cpp.

Change-Id: I902954d4bed6fe68802183e51d82700fe30af437
Reviewed-by: Mathias Hasselmann <mathias.hasselmann@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoQPrinter - Simplify setting manual properties
John Layt [Mon, 25 Nov 2013 16:18:48 +0000 (17:18 +0100)]
QPrinter - Simplify setting manual properties

Change from a list to a set and define a utility method to both set the
property and store that we have set it.

Change-Id: I0cf13f1b0e90942424744316d0d3f699b9ead144
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agoQPrinter - Fix OutputFormat when no printers
John Layt [Sat, 23 Nov 2013 18:52:34 +0000 (19:52 +0100)]
QPrinter - Fix OutputFormat when no printers

Currently the QPrinter constructor, setOutputFormat() and
setPrinterName() make bad assumptions about the availability of printers
when configuring NativeFormat which can lead to inconsistent print
engine set-ups leading to crashes in the print dialog, especially on
Windows where a valid DEVMODE is needed.

This change cleans up the init and methods to ensure NativeFormat can
only ever be set if we have both a valid plugin and a valid printer,
if not the PdfFormat is used.  One side-effect of this is that it is
now impossible to set an invalid printer name via QPrinter (but still
able to be done via QPrintEngine if really needed).  Also if no
default printer is set then use the first available one.

This also fixes a bug where setting a new printer name on Windows
reset all the saved settings.

[ChangeLog][Important Behavior Changes] QPrinter no longer allows you
to set an invalid printer name.

Task-number: QTBUG-34345
Task-number: QTBUG-26008
Task-number: QTBUG-26430
Change-Id: I19737e4209d8c8df5817ea83246b3dd0c483ee85
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Lars Knoll [Fri, 29 Nov 2013 14:09:56 +0000 (15:09 +0100)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

3 years agoMerge remote-tracking branch 'origin/release' into stable
Simon Hausmann [Fri, 29 Nov 2013 10:37:30 +0000 (11:37 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I2e2bf789b0fe8442ed623bc0c8aef591235cdabe

3 years agoMake OpenGL examples work on retina displays.
Morten Johan Sørvig [Thu, 28 Nov 2013 22:45:36 +0000 (23:45 +0100)]
Make OpenGL examples work on retina displays.

glViewport expects device pixels, but the various
geometry accessors returns values in device-independent
pixels.

Change-Id: I8004692de82251e4f1f25bf8f2698895f222ede3
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agoDocs: add important QWheelEvent::phase() related notes
J-P Nurmi [Wed, 27 Nov 2013 12:24:59 +0000 (13:24 +0100)]
Docs: add important QWheelEvent::phase() related notes

Change-Id: I4901b96b44b7c1179e678689af5962cb4570d50d
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoDoc: corrected invalid ref. to output iterators
Nico Vertriest [Wed, 27 Nov 2013 13:47:26 +0000 (14:47 +0100)]
Doc: corrected invalid ref. to output iterators

Task-number: QTBUG-34749
Change-Id: I7abd504b6081e84a8e67c7957e13d402999e9d38
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
3 years agoAdd a few notes to changes-5.2.0
Eskil Abrahamsen Blomfeldt [Wed, 27 Nov 2013 08:12:08 +0000 (09:12 +0100)]
Add a few notes to changes-5.2.0

Mostly changes for Android. One change in Qt Gui.

Change-Id: Ifce627b6688702b3a3ae1634bd344eb8331f6caf
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
3 years agoiOS: Provide default launch image for 4-inch devices
Tor Arne Vestbø [Tue, 26 Nov 2013 12:40:21 +0000 (13:40 +0100)]
iOS: Provide default launch image for 4-inch devices

Otherwise the application will not scale to the full resolution of
the device. We copy the image into the Xcode project, since it's
internal to our build system and not meant as a template to be
edited by the user.

For 5.3 we need to provide a proper qmake/qbs mechanism to handle
launch images.

Task-number: QTBUG-31431
Change-Id: Ied0b2843a78c5ea865750e0404418ced7ad27082
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
3 years agoiOS: Update screen properties when we trigger statusbar changes on iOS7
Tor Arne Vestbø [Wed, 27 Nov 2013 17:20:10 +0000 (18:20 +0100)]
iOS: Update screen properties when we trigger statusbar changes on iOS7

Ideally we'd have a callback from iOS when this happens, so we can also
react to changes done outside of Qt, but willChangeStatusBarFrame and
friends do not seem to give us what we want.

Change-Id: I686ce7950395a83c4257372363c773a95c3935ed
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
3 years agoiOS: Forward [UIApplicationDelegate handleOpenURL:] to QDesktopServices
Tor Arne Vestbø [Thu, 28 Nov 2013 14:33:06 +0000 (15:33 +0100)]
iOS: Forward [UIApplicationDelegate handleOpenURL:] to QDesktopServices

The user may use QDesktopServices::setUrlHandler() in combination with
the appropriate Info.plist keys (CFBundleURLTypes, CFBundleURLSchemes)
to react to URL requests from other applications.

This is among other things useful for handling OAuth authentication from
applications such as Dropbox. See:

  https://www.dropbox.com/developers/core/start/ios

We protect against recursive URL opening, but an application may still
redirect a request to open a URL by opening another URL, eg a website.

Task-number: QTBUG-35201
Change-Id: I9f1d246206c5594b1b65bb11fa98c6bcdefc443e
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
3 years agoUpdate ChangeLog for 5.2.0 [QtWidgets II]
Marc Mutz [Tue, 26 Nov 2013 11:27:45 +0000 (12:27 +0100)]
Update ChangeLog for 5.2.0 [QtWidgets II]

Second batch of changes.

Change-Id: I5b3add1df19bcad195f8b9286337de9fe926337c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoFix invalid memory read when shutting down QML applications
Simon Hausmann [Thu, 28 Nov 2013 10:00:15 +0000 (11:00 +0100)]
Fix invalid memory read when shutting down QML applications

As the last line in the QObject destructor, we call setParentHelper(0) to
remove ourselves from the parent. In the process of that we also initiate the
QML parentChanged callback. The first thing that parentChanged callback used to
do (but now does it too late, after 26350b5ceafa0ade1328037f6234a7d288eb8f48 in
qtdeclarative) is to check if the object was deleted and then return. We could
re-introduce the check there, but I think it's cleaner to not bother calling
the callback on a dead object in the first place.

Change-Id: Ia4d43b65a9b3744a451b4c312a2d6f9c0e3b67dc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoCocoa: avoid a crash in QCocoaDrag
Liang Qi [Thu, 28 Nov 2013 13:42:56 +0000 (14:42 +0100)]
Cocoa: avoid a crash in QCocoaDrag

NSEvent needs to be copied.

Reference:
http://lists.apple.com/archives/cocoa-dev/2007/Dec/msg00678.html

Task-number: QTBUG-33533
Change-Id: I73709545573e59aab6875a8c3dd903cb171e858f
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
3 years agoAdd QSystemSemaphore::release() auto-tests
Konstantin Ritt [Sun, 10 Nov 2013 13:34:36 +0000 (15:34 +0200)]
Add QSystemSemaphore::release() auto-tests

Change-Id: I4c48f9ad8c60307e4b922d6a6b82e03e455f14d9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
3 years agoQSystemSemaphore: Clear error after successful operation
Konstantin Ritt [Sun, 10 Nov 2013 13:42:05 +0000 (15:42 +0200)]
QSystemSemaphore: Clear error after successful operation

Change-Id: I5c1021b2329439e3aefaa1c0d9c0b8a298d285de
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoStreamline font match() function.
Friedemann Kleint [Thu, 28 Nov 2013 08:07:36 +0000 (09:07 +0100)]
Streamline font match() function.

Determine writing system before executing the loop.

Change-Id: I6c462bdef4d70860e76c7cc9d939e3e92983b173
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
3 years agoRemove unused variable in font match() function.
Friedemann Kleint [Thu, 28 Nov 2013 08:06:26 +0000 (09:06 +0100)]
Remove unused variable in font match() function.

Change-Id: I0752901556a44c3b7fb4440e3ba0ca88559c1fe2
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
3 years agoMove the glxfbconfig configtest to qpa and rename it to glx
Jorgen Lind [Thu, 28 Nov 2013 10:06:29 +0000 (11:06 +0100)]
Move the glxfbconfig configtest to qpa and rename it to glx

We require glx version 1.3 which is where fbconfig is first defined.
Also make use of the configure test and report the glx status.
GLX support should always take precedence when compiling the
xcb backend

Change-Id: Ie46834210bf5cd2ac4006ff08379e0d3434ffa2b
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
3 years agoAdd new configure parameter for Xcb-Xlib
Andrew Knight [Thu, 28 Nov 2013 11:07:09 +0000 (13:07 +0200)]
Add new configure parameter for Xcb-Xlib

This adds a new configuration parameter, xcb-xlib, which allows
overriding the configure test for that existing configuration option.

The use of xcb-xlib in the xcb platform plugin becomes the preferred path
for non-OpenGL ES 2 builds, while the EGL codepath is used otherwise.
This has the advantage that EGL can be used with Desktop OpenGL if Qt is
configured with -no-xcb-xlib.

Change-Id: I5018e31fe0399b94f020c671eff9414d00431c44
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
3 years agoRemove stale xcb_dri2 code in QXcbNativeInterface
Jorgen Lind [Tue, 26 Nov 2013 14:21:56 +0000 (15:21 +0100)]
Remove stale xcb_dri2 code in QXcbNativeInterface

Change-Id: Ifc8dc8d84fc60b70f8a49282dfe32cd248bef9ba
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agoMerge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging...
Frederik Gladhorn [Thu, 28 Nov 2013 09:08:55 +0000 (10:08 +0100)]
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable

3 years agoFix font lookup.
Friedemann Kleint [Wed, 27 Nov 2013 15:32:28 +0000 (16:32 +0100)]
Fix font lookup.

Change match() to return an index and use that to reintroduce
the blacklist bookkeeping for fonts for which font engine
creation fails (for example, due to missing open type support).
Change the algorithm to retry search if that happens.
Add empty string as fallback for non-common scripts indicating
'try to find any font matching the script' as is done in Qt 4.

Task-number: QTBUG-34908
Change-Id: I9ac81ff1c275ebb635675dc26b52394789fca60c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoImprove digitToCLocale sign char handling
Samuel Gaist [Wed, 27 Nov 2013 08:11:28 +0000 (09:11 +0100)]
Improve digitToCLocale sign char handling

This patch adds more char tests for the plus and minus signs to
ensure that e.g. number input widgets can be used with the locale
and the known sign chars.

[ChangeLog][QtCore] Fixed a bug that caused negative number input
using '-' to be rejected because the current locale uses e.g. 0x2212.
QIntValidator and QDoubleValidator now accepts both signs as well as
the locale minus sign.

Task-number: QTBUG-35069
Change-Id: I857105ca38b1d3826e27eb64645fef07149d74bc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoMerge remote-tracking branch 'origin/release' into stable
Simon Hausmann [Thu, 28 Nov 2013 08:18:36 +0000 (09:18 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I860404a1ef18c88a968a9eded405bb67967047b9

3 years agoFix sub-second handling in SQLite driver
Tobias Koenig [Wed, 27 Nov 2013 12:11:01 +0000 (13:11 +0100)]
Fix sub-second handling in SQLite driver

Use explicit format string, that contains milliseconds, when
converting an QDateTime/QTime to a SQLite field content.

Task-number: QTBUG-24200
[ChangeLog][QtSql][QSQLITE] Fix sub-second handling
Change-Id: Ib89152b7c3dd780b57a8826beff8b6b118e9d3d6
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
3 years agoFix sub-second handling in MySQL driver
Tobias Koenig [Wed, 27 Nov 2013 11:46:18 +0000 (12:46 +0100)]
Fix sub-second handling in MySQL driver

As stated in http://dev.mysql.com/doc/refman/5.7/en/c-api-prepared-statement-data-structures.html
the content of MYSQL_TIME.second_part field is supposed to be
in microseconds not milliseconds.

Task-number: QTBUG-31124
[ChangeLog][QtSql][QMYSQL] Fix sub-second handling
Change-Id: I5718868029bdedab9508213e800d2dcf3da9be9a
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
3 years agoFix problem with QNetworkAddressEntry returning a invalid netmask.
Christian Strømme [Wed, 27 Nov 2013 14:04:09 +0000 (15:04 +0100)]
Fix problem with QNetworkAddressEntry returning a invalid netmask.

The ip address should be set before the netmask. The reason for this is
that QNetworkAddressEntry::setNetmask() compares the protocol of the
netmask and the ip, if they don't match the netmask won't be set.

Task-number: QTBUG-33911
Change-Id: Ic344b3653c5dfdc5df912dee16e4dbe069d57d24
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agotests: fix tst_QSettings on Mac
Kurt Pattyn [Sun, 17 Nov 2013 23:15:02 +0000 (00:15 +0100)]
tests: fix tst_QSettings on Mac

* Add a check for the case sensitivity of the file system, so that
unit tests can determine whether names of preference files with
different case should generate an error or not.
* Add check for OS X native file format in rainersSyncBugOnMac().

Task-number: QTBUG-32655
Done-with: Liang Qi <liang.qi@digia.com>
Change-Id: I76821653dd4ebc00e20abdbb5b79c1a80290dece
Reviewed-by: Liang Qi <liang.qi@digia.com>
3 years agoQPrinter - Make PDF support required for QPrinter
John Layt [Sat, 23 Nov 2013 14:42:56 +0000 (15:42 +0100)]
QPrinter - Make PDF support required for QPrinter

Most of QPrinter assumes that QPdf is available as the fall back engine
in case either the plugin fails to load or there are no real printers
configured. Make this assumption explicit in the feature configure and
remove the two places where QT_NO_PDF is actually checked.

Change-Id: Ibb1bdf3bafa5809fbc844c84d7127911a1685506
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agoReturn the xcb_screen_t and not the QPlatformScreen
Jorgen Lind [Wed, 27 Nov 2013 14:18:59 +0000 (15:18 +0100)]
Return the xcb_screen_t and not the QPlatformScreen

from QXcbNativeInterface. The QPlatformScreen is available from
QScreen::handle()

Change-Id: If81daf34c07f4a49c85c43d3755d1a9167626d6d
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
3 years agoFix directwrite font engine compile
Louai Al-Khanji [Wed, 27 Nov 2013 12:56:19 +0000 (14:56 +0200)]
Fix directwrite font engine compile

Add missing comma that prevented compilation.

Change-Id: If771366adf3a31427c2beefa09c0206653f8ec84
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
3 years agoAllow resetting Qt::WindowFullscreenButtonHint
Zeno Albisser [Wed, 27 Nov 2013 12:34:55 +0000 (13:34 +0100)]
Allow resetting Qt::WindowFullscreenButtonHint

Currently Qt::WindowFulscreenButtonHint is only
respected on window creation. But flags
can also be adjusted later on.
Further setWindowShadow can be removed from
within createNSWindow, as it operates on a Nil
object in that case. It is however called by
recreateWindow / setWindowFlags subsequently.

Change-Id: I507d6fde5ad2f0ee5b9db322325ede99b70e151e
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
3 years agoCMake: Parse the output of new CMake versions.
Stephen Kelly [Wed, 27 Nov 2013 11:22:54 +0000 (12:22 +0100)]
CMake: Parse the output of new CMake versions.

As of CMake 3.0, the output of `cmake --version` now has a second line
showing that it is maintained by Kitware. Change the version parsing to
look only at the first line of output.

Change-Id: I347de4c376e0bde25a43a38d59587d9b63f6b43a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoDo not disable egl on desktop gl automatically
Albert Astals Cid [Tue, 19 Nov 2013 15:53:21 +0000 (16:53 +0100)]
Do not disable egl on desktop gl automatically

desktop opengl and egl are not incompatible with eachother, so there
is no need to disable egl when on desktop opengl

Task-number: QTBUG-34949

Change-Id: I757c38674a480910d1cb23853c255eb993e107ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
3 years agoQCocoaFileDialogHelper: Cache directory until delegate has been created
Gabriel de Dietrich [Tue, 26 Nov 2013 15:27:17 +0000 (16:27 +0100)]
QCocoaFileDialogHelper: Cache directory until delegate has been created

Task-number: QTBUG-34393

Change-Id: Idee9e879e586afe25fd099d157ed7af88c17c4a3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
3 years agoFix coding style in QLabel example code
hjk [Sat, 9 Nov 2013 19:40:17 +0000 (20:40 +0100)]
Fix coding style in QLabel example code

Change-Id: I13838c1759b14089ba9f4daf442048fb5c8da738
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
3 years agoCheck the thread in QOffscreenSurface
Laszlo Agocs [Tue, 26 Nov 2013 12:09:42 +0000 (13:09 +0100)]
Check the thread in QOffscreenSurface

The QWindow-based fallback will not work when the QOffscreenSurface is
created outside the main thread. Show a warning in this case.

Note that it is fine to use the QOffscreenSurface instance in another
thread. It is just the creation that must happen on the main thread.

Change-Id: If80da39e610813755b9ba2f6831b187b258b8266
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agowindows: Set forward compatibility bit properly
Laszlo Agocs [Tue, 26 Nov 2013 13:25:11 +0000 (14:25 +0100)]
windows: Set forward compatibility bit properly

The bit should be set when QSurfaceFormat::DeprecatedFunctions is
_not_ specified. The documentation was correct, the implementation
was not.

Change-Id: If7202d3a59d5336fff255a290b65fb4bfa7b79c9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agoRevert "Store the font's scalability in QFontEngine."
Yoann Lopes [Fri, 22 Nov 2013 17:45:49 +0000 (18:45 +0100)]
Revert "Store the font's scalability in QFontEngine."

This reverts commit 65b12fbdb13d34c61bcadd5cc8fd6ee28a8dfafd.

QFontEngine is not always loaded from QFontDatabase, resulting in
the flag not being set.

Change-Id: I39bc5bd4a8dea153d191cfc55f4324195f75f64c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoQNX: Fix retrieving the window group name
Frank Osterfeld [Fri, 22 Nov 2013 09:43:49 +0000 (10:43 +0100)]
QNX: Fix retrieving the window group name

The code assumes that there is a root window, and crashed
otherwise.

Task-number: QTBUG-35121
Change-Id: Idbf0e0bfc03cd427f0aab81db88b34fe94228c81
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
3 years agoRemove leading '/' from target paths.
Stephen Kelly [Tue, 26 Nov 2013 14:06:20 +0000 (15:06 +0100)]
Remove leading '/' from target paths.

This is inappropriate on Windows, and breaks non-prefix builds there.

This is only needed when we calculate a relative path from a sysroot,
so only add it in that case.

Task-number: QTBUG-34880
Change-Id: I0e3b3d977a7b56649e4ba0077ac574aabf1dc915
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
3 years agoFix test compilation on WinRT
Andrew Knight [Tue, 26 Nov 2013 09:00:31 +0000 (11:00 +0200)]
Fix test compilation on WinRT

Tweak a handful of tests which didn't compile on this platform.

Change-Id: I208d9eb289dfb226746c6d0163c3ea752485033b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
3 years agoQCoreApplication: Add static setter for application file path.
Friedemann Kleint [Fri, 22 Nov 2013 13:31:05 +0000 (14:31 +0100)]
QCoreApplication: Add static setter for application file path.

In cases where QGuiApplication is instantiated by a library
embedded into another application via some plugin mechanism
(for example, Active X controls built using Qt), the QPA platform plugin
and other plugins cannot be found next to the application executable.
In this case, the library should set the application file path to
its deployment location such that plugin paths are set accordingly,
the directory is added to the path and qt.conf is found, should it exist.

Task-number: QTBUG-34989

Change-Id: I4a53104b5121a8d26751129912f999228be45dfd
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years agoQPrinterInfo - Fix isNull() by fixing constructors
John Layt [Mon, 25 Nov 2013 19:36:58 +0000 (20:36 +0100)]
QPrinterInfo - Fix isNull() by fixing constructors

The QPrinterInfo copy and QPrinter constructors and the assignment
operator were not taking the shared_null into account, and so any use
of them resulted in a new null QPrinterInfo different to shared_null,
which lead to isNull() always returning true in anything other than
the simplest use case. While fixing this also make the shared_null a
Q_GLOBAL_STATIC.

Task-number: QTBUG-21087

Change-Id: I0beb24088208e9ed58d21ca26b0c8d00b02e5b8f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agoQPrintDialog - Fix casting print engine
John Layt [Mon, 25 Nov 2013 22:15:55 +0000 (23:15 +0100)]
QPrintDialog - Fix casting print engine

We want to cast the print engine, not the paint engine.

Change-Id: Ia8f11f0215fa066417118fbfbcc921a60282d713
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agoWindows: Close handle to thread checking for adopted threads.
Friedemann Kleint [Wed, 20 Nov 2013 12:37:48 +0000 (13:37 +0100)]
Windows: Close handle to thread checking for adopted threads.

Task-number: QTBUG-34840

[ChangeLog][QtCore][QThread][Windows][QTBUG-34840] Fix handle leak.

Change-Id: I537c1c81a43907f01a81be740746582266969c6f
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agodo not embed manifests into Qt plugins by default
Joerg Bornemann [Fri, 22 Nov 2013 17:36:25 +0000 (18:36 +0100)]
do not embed manifests into Qt plugins by default

For plugins that are built with a different (but binary compatible)
MSVC runtime than Qt is built with, the plugin's embedded manifests
prevent a successful loading of the plugin.
There's no need for having the plugins tied to a certain CRT version
as they are bound to Qt's CRT version.

Task-number: QTBUG-1297
Change-Id: I6ae4cadd99ee4657e613b07a40141a7bae08424f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
3 years agoFix compiler warnings.
Erik Verbruggen [Fri, 22 Nov 2013 12:02:23 +0000 (13:02 +0100)]
Fix compiler warnings.

As seen with Xcode 5.0.2.

qmacclipboard.mm:108:30: warning: cast to 'void *' from smaller integer type 'int' [-Wint-to-void-pointer-cast]
        promiseKeeper(paste, (PasteboardItemID)promise.itemId, flavor, this);
                             ^
qmacclipboard.mm:316:56: warning: cast to 'void *' from smaller integer type 'int' [-Wint-to-void-pointer-cast]
                        PasteboardPutItemFlavor(paste, (PasteboardItemID)itemID, QCFString(flavor), 0, kPasteboardFlavorNoFlags);
                                                       ^

Change-Id: I94b8ea2ff32d606d4cab28981b26c2ef516035dc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
3 years agoCoreWLan: Fix potential unhandled exception assert
Gabriel de Dietrich [Mon, 25 Nov 2013 12:41:49 +0000 (13:41 +0100)]
CoreWLan: Fix potential unhandled exception assert

-[QNSListener notificationHandler:] was declared as not taking any parameter,
but used as taking a single NSNotification. This would lead to an 'unrecognized
selector' exception raised by Cocoa.

Task-number: QTBUG-26844
Change-Id: I56d03a7738c2a1b9dcf3cdecc696b01e65d7b233
Reviewed-by: Liang Qi <liang.qi@digia.com>
3 years agoAndroid: Remove invalid error message
Eskil Abrahamsen Blomfeldt [Tue, 26 Nov 2013 09:13:04 +0000 (10:13 +0100)]
Android: Remove invalid error message

All usage of context menus prints out an error message because
onContextMenuClosed() is called more than once. We just return
silently instead if the method is called after the menu has
already been closed.

Change-Id: Ifa27ed42d188fdf670f09c4b1450b9fec0d5941f
Reviewed-by: BogDan Vatra <bogdan@kde.org>
3 years agoFix for co-existence of QtDeclarative and QtQml
Simon Hausmann [Tue, 26 Nov 2013 09:45:53 +0000 (10:45 +0100)]
Fix for co-existence of QtDeclarative and QtQml

As a follow-up to commit 2f87fde9bb4bad6787101c0d135419b350b201a5, we also need
to change "hack" in the QGraphicsItem and QWidget destructor for early item
destruction to support the _qml1 variant of the QObject destroyed callback.

Task-number: QTBUG-35006

Change-Id: I65e37b1e9ddd8d14267aaba024408611b8cd3d77
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoMerge remote-tracking branch 'origin/release' into stable
Frederik Gladhorn [Tue, 26 Nov 2013 09:51:33 +0000 (10:51 +0100)]
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I83ff8f4d7dffd7385013a1bd8a1732a89ee20d56

3 years agoFix deadlock when disconnecting connections made with function pointers v5.2.0-rc1
Olivier Goffart [Thu, 21 Nov 2013 17:37:36 +0000 (18:37 +0100)]
Fix deadlock when disconnecting connections made with function pointers

The regression was introduced in 5885b8f775998c30d53f40b7f368c5f6364e6df4

QMetaObjectPrivate::disconnectHelper may unlock the sender mutex. And
while relocking it, we need to make sure to lock the sender and receiver
mutex in the right order.  So don't lock the receiver mutex in advance, but
re-lock it for each connection.

Change-Id: I4f6d19791cdcce3693d7f45e7beb6b564fd69277
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoFix formatting in the platform-specific changes part of the ChangeLog
Thiago Macieira [Mon, 25 Nov 2013 19:51:36 +0000 (11:51 -0800)]
Fix formatting in the platform-specific changes part of the ChangeLog

No need to have the "Qt for" part of the platform. This was used back
in the Qt 4 days when we referred to "Qt for Embedded Linux" or
"QtopiaCore" before that.

This also fixes the duplicated "Windows" and "Qt for Windows" sections.

Change-Id: Ia04172d0f322079f667b64a90c5f23d03588d0db
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoReflow the ChangeLog part for QtNetwork
Thiago Macieira [Mon, 25 Nov 2013 19:50:41 +0000 (11:50 -0800)]
Reflow the ChangeLog part for QtNetwork

Wrap to column 76, add a space before the dash and remove the
line between entries with no sub-bullets.

Change-Id: Ibba86161659ccad9fe98dd37a9eba57e807aa3ac
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoUpdate ChangeLog for 5.2.0 [QtDBus]
Thiago Macieira [Mon, 25 Nov 2013 19:47:39 +0000 (11:47 -0800)]
Update ChangeLog for 5.2.0 [QtDBus]

Change-Id: I8b58ea636eac2be4da967c18057c38990bc9178f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoFix a race that occurred as we unlock the mutex to destroy the functor in ~QObject
Olivier Goffart [Fri, 15 Nov 2013 08:46:02 +0000 (09:46 +0100)]
Fix a race that occurred as we unlock the mutex to destroy the functor in ~QObject

When we unlock the mutex, we need to take in account that the Connection
pointed by 'node' may be destroyed in another thread while it is unlocked
Doing  'node->prev = &node'  will make sure that 'node' is actually
updated when it is destroyed.

Setting isSlotObject under the mutex is safer and ensure that no other
thread will attempt to deref the object.

The regression was introduced in 5885b8f775998c30d53f40b7f368c5f6364e6df4

tst_qobjectrace was updated to catch races arising when we are
connecting with function pointers.

Change-Id: Ia0d11ae8df563dad97eb86993a786b579b28cd03
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoEvdev keyboard handler emits keyevents with QString(0xffff)
Allan Sandfeld Jensen [Fri, 22 Nov 2013 15:00:36 +0000 (16:00 +0100)]
Evdev keyboard handler emits keyevents with QString(0xffff)

Key events that have no text representation are by the evdevkeyboard
emitted as a QString(0xffff). Other keyboard event handlers appear to
all emit key events with null strings for these events.

Change-Id: If6b5c61a8cb76a6843238f834ce4feb4b73aa199
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agosrc/gui/text: whitespace fixes
J-P Nurmi [Sun, 24 Nov 2013 12:40:37 +0000 (13:40 +0100)]
src/gui/text: whitespace fixes

Change-Id: Idd0e0673d76a23593b03558e18bc6afbdb9b38ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoiOS: Update statusbar visibility and screen properties before window geometry
Tor Arne Vestbø [Mon, 25 Nov 2013 14:45:43 +0000 (15:45 +0100)]
iOS: Update statusbar visibility and screen properties before window geometry

When setting a new window state. Otherwise we set the geometry based on
the old screen properties, and then rely on the properties causing
another window layout, which may not always happen. We also need to
explicitly update the screen properties when the statusbar changes
visibility, as there are no callbacks from iOS that consistently gives
us that information.

Change-Id: I1c3328aa3f34d294bc7db8884e611d205fd2c761
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
3 years agoiOS: Prefer window states over geometry-heuristics when laying out windows
Tor Arne Vestbø [Mon, 25 Nov 2013 14:07:21 +0000 (15:07 +0100)]
iOS: Prefer window states over geometry-heuristics when laying out windows

A window that was resized to the full screen size of the screen would
otherwise always stay in full screen, even if the window state was
maximized.

Change-Id: I4720f7b6ad1d85658ea96c6da0515693e8c827f3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
3 years agoiOS: Don't warn about QBackingStore::resize() != window.size() for widgets
Tor Arne Vestbø [Fri, 22 Nov 2013 12:16:14 +0000 (13:16 +0100)]
iOS: Don't warn about QBackingStore::resize() != window.size() for widgets

QtWidgets uses stale geometry data to do its backingstore resizes in a
lot of places, eg QWidgetPrivate::setGeometry_sys() and show_sys(). As
the resize doesn't have any effect for our GL backingstore anyways
we can skip the warning to keep console noise down.

Change-Id: Ie578f7faf35985708fddd0bfca4a7080820192c5
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
3 years agoiOS: Don't enable translucent statusbar for iOS6 on iPads
Tor Arne Vestbø [Fri, 22 Nov 2013 12:15:35 +0000 (13:15 +0100)]
iOS: Don't enable translucent statusbar for iOS6 on iPads

It's only available on iPhone/iPods.

Change-Id: I61b45c84ddb2b3db46fff36286a6582406fa7d26
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
3 years agoRevert "Android: Use native platform menus."
Eskil Abrahamsen Blomfeldt [Mon, 25 Nov 2013 12:13:11 +0000 (13:13 +0100)]
Revert "Android: Use native platform menus."

This reverts commit 98f0b4668999d677d8bf91d57ac095d96e7a661c.

The native menu popup would never exit its event loop, because
there's no listener for the closing of the menu. Since this is very
last minute and the change is not ready, we revert it and use
the widget menus instead.

Change-Id: Ie9ae707300a265130a90d1ccb5f093f50cc0b2fb
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
3 years agoiOS: close keyboard upon hitting key 'done'
Richard Moe Gustavsen [Mon, 25 Nov 2013 15:53:20 +0000 (16:53 +0100)]
iOS: close keyboard upon hitting key 'done'

Change-Id: I0098cc4d51ca600ba48baa15ed9c16e56529b947
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
3 years agoUpdate ChangeLog for 5.2.0 [QtCore]
Thiago Macieira [Mon, 25 Nov 2013 19:32:52 +0000 (11:32 -0800)]
Update ChangeLog for 5.2.0 [QtCore]

Change-Id: I2f6adc13d454825a2f444121a87dfd189e1c70f9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoUpdate ChangeLog for 5.2.0 [QtWidgets]
Marc Mutz [Sat, 23 Nov 2013 21:03:50 +0000 (22:03 +0100)]
Update ChangeLog for 5.2.0 [QtWidgets]

First batch of changes applied to src/widgets since v5.1.0.

Change-Id: I23515e8dd340f8551d1681d0abeb2cbbff3683d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoUpdate changelog for 5.2.0 RC1
Thiago Macieira [Tue, 19 Nov 2013 04:01:24 +0000 (20:01 -0800)]
Update changelog for 5.2.0 RC1

Change-Id: I3a34fe4d26dab1eab9518f995406ecc85d5ff4c1
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
3 years agoactually complain about invalid -[no-]{sql|imageformat}-* options
Oswald Buddenhagen [Thu, 21 Nov 2013 18:35:13 +0000 (19:35 +0100)]
actually complain about invalid -[no-]{sql|imageformat}-* options

Change-Id: I0530d7dcdeb944db76bc708512c57e537f2c95c8
Reviewed-by: Vladimir Minenko <vminenko@rim.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
3 years agoiOS: update keyboard layout upon focus transfer
Richard Moe Gustavsen [Sat, 16 Nov 2013 09:59:17 +0000 (10:59 +0100)]
iOS: update keyboard layout upon focus transfer

When iOS transfers focus from one view to another, it
asks the new view for its UIKeyInput properties before
deciding how the keyboard should be configured.

For Qt, the same QUIView is used for the whole QWindow
which means that UIKit will not change the keyboard
configuration just because we change the focus object
in Qt, since the UIView does not change.

There seems to be no way to tell UIKit that the
keyboard needs to change becuse the UIKeyInput
properties has changed. To work around this, we
briefly resign first responder status, and grabs it
again, for the same QUIView.

Change-Id: I2d15cc0c928deb023e7da58ad4669b7099dce2cf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
3 years agoiOS: add [QUIView updateTextInputTraits]
Richard Moe Gustavsen [Mon, 25 Nov 2013 10:30:56 +0000 (11:30 +0100)]
iOS: add [QUIView updateTextInputTraits]

Configure QUIView text input traits from IM hints
returned by the focus object when the view becomes
first responder. This will affect the layout of the
virtual keyboard.

Change-Id: Ib140ba69d01cc747f3ac3cdd70dd2e7daede26b0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
3 years agoiOS: don't loose precision when converting CG types
Richard Moe Gustavsen [Fri, 22 Nov 2013 16:41:39 +0000 (17:41 +0100)]
iOS: don't loose precision when converting CG types

CGRect and CGPoint consist of CGFloat variables. So
we should convert to QRectF and QPointF rather than
QRect and QPoint.

Change-Id: I76f180e4064f54d5810c49b88fdbbcd914bdb686
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
3 years agoiOS: don't scroll after inputItem has moved
Richard Moe Gustavsen [Wed, 20 Nov 2013 21:14:40 +0000 (22:14 +0100)]
iOS: don't scroll after inputItem has moved

If the inputItem moves, it typically means that the user
scrolls or flicks the focus item around. In that case
we should avoid scrolling the screen, otherwise they
will "cancel out" each other. Besides, when the user
flicks, he takes control over the whereabouts
on the screen anyway.

Change-Id: Iad0762965f9dcdbcca934ce6d90a8c1413ce3ca2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
3 years agoiOS: scroll screen when keyboard opens
Richard Moe Gustavsen [Thu, 14 Nov 2013 08:58:25 +0000 (09:58 +0100)]
iOS: scroll screen when keyboard opens

This change will let QIOSInputContext scroll the root
view when the virtual keyboard is open, so that the input cursor
is not obscured.

Change-Id: If0758f4bf04c2b8e554e0196451154def7e3cb86
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>