Commit Graph

20797 Commits

Author SHA1 Message Date
Tor Arne Vestbø
25948f83b4 iOS: Make a few member variables of QIOSTextInputResponder private
Change-Id: I269b1b5ab802c391a12bcdc8cfe0c4d3e52f9cba
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2014-10-28 18:40:56 +01:00
Oswald Buddenhagen
8613b64f53 Merge remote-tracking branch 'origin/5.3' into 5.4
Change-Id: I224e44a9df314b9a99d33148b6cf400fcbc9de8e
2014-10-28 18:21:45 +01:00
Alexander Volkov
a3cb057c3d Doc: Don't show a description for omitted SH_ComboBox_UseNativePopup enum item
\omitvalue does not allow a description of an enum item, so move
the description as a comment to the enum declaration.

Change-Id: I4192b16e41b704cbad66c0eeafcb141087d2ba65
Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-10-28 14:05:57 +01:00
Joerg Bornemann
d8f940930e vcxproj: fix writing of librarian settings
The settings of the librarian were never written.
Creation of static libraries only worked by accident.
Adapted the code from the vcproj code path.

Task-number: QTBUG-30712
Change-Id: I69917f44305eb458647392d222db477fe5a5b7c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2014-10-28 14:05:48 +01:00
MihailNaydenov
6fa2fec1dd OS X: Fix broken 2x menu icon when style sheet is applied
Task-number: QTBUG-41623
Change-Id: I4e0640a7739d0ce4f8758dd5d8d17882a6947467
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-10-28 14:05:38 +01:00
Andrew Knight
d6c1a9cb26 direct2d: Fix window resize with translucent windows
If the size of the window has changed, the backing bitmap should be
reset with the new geometry.

Change-Id: I1ca430cd7b5df1845b4fef31f5bf8f05d889a2fc
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
2014-10-28 14:05:02 +01:00
Andrew Knight
a570e8b0f6 direct2d: Fix pixmap fills in composition emulation mode
When painting a pixmap with rasterFill, the brush should be offset to
match the fill path.

Change-Id: I4e361932643c4a98dce74e55ed16fae274bce43b
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
2014-10-28 14:05:00 +01:00
Joerg Bornemann
b0098056e5 fix namespaced DirectWrite build
Change-Id: Iec6d6ca121b2b04fc1eb4a97f1387ee630e6e1f5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-10-28 14:04:50 +01:00
Oswald Buddenhagen
4d5f9df8ab pay attention to the MAKE env variable
... to avoid that inherited MAKEFLAGS turn out to be incompatible with
the make we choose.

Task-number: QTBUG-39527
Change-Id: I47d4cec58b0643cc5d97868e70b24f7f37e964bb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-28 14:04:45 +01:00
Volker Krause
fe7c5feb0d Add missing newline in fallback debug output.
This is hit in case of a recursion in the message handler, and message
hasn't gone through qMessageFormatString at this point and thus lacks
the newline.

Change-Id: Ia098b6ccbcc1aff22a4695865f39143ba0152d9c
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-28 14:04:34 +01:00
Steffen Imhof
7f8f476244 Compile fix for QT_NO_IM in QtWidgets
Added some #ifdef guards around usages of composeMode().

Change-Id: If2f2d3cae21b270933b38ea67dcc885f5871785f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2014-10-28 14:04:27 +01:00
Steffen Imhof
3dc4b9ac86 Move animation-related header out of QT_NO_IM #ifndef.
Change-Id: I7f0bfed4ff9a608575cf6795016b2fa134fd273f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
2014-10-28 14:04:23 +01:00
Timur Pocheptsov
916dfcb827 OS X - Cocoa backing store and drawRect
m_backingStore pointer has a limited 'lifetime' - usually
it is set in -flushBackingStore:region:offset: method, then -drawRect:
is invoked/forced by -setNeedsDisplayInRect:, after that it's dangerous to
have a non-null pointer to a backing store (and we reset it).
But if Cocoa invokes drawRect (due to some reason) our null backing store pointer is also
not good. This patch instead is using a shared resource (QImage) from a backing store.
This patch also makes getBackingStoreCGImage() redundant - -drawRect: was the only
place we called it.

Task-number: QTBUG-42206
Change-Id: Ie7726336f05d07c52f660f6326ae5cef114201dd
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2014-10-28 13:32:02 +01:00
Alexander Volkov
148aa0e3e3 Doc: Fix method names for QFileSystemModel
There are no methods called name() and path(), replace them by
fileName() and filePath().

Task-number: QTBUG-41881
Change-Id: I001a8ead197327fac69e69d94230587ddb1a4692
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
2014-10-28 13:09:15 +01:00
Nico Vertriest
070b183dbc Doc: removed reference to obsolete classes
QSocket and QSocketDevice are not part of Qt 5.4

Task-number: QTBUG-40362
Change-Id: Ieffd992c203af94cac0eb21a630b6ac98754f358
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-10-28 13:08:29 +01:00
Tor Arne Vestbø
50cadb87e8 iOS: Detect window deactivation without waiting for next runloop iteration
Since we know and control whether or not we are making a new QUIView first
responder, we can take not of this at that point, and use that information
when another view is resigning first responder.

Change-Id: I508720d418c92dc8a8011b489cc5cace8fc82633
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2014-10-28 13:05:05 +01:00
Tor Arne Vestbø
5a4fad1479 iOS: Add logging category for input method debugging
Change-Id: If1505b3b5f6ceb18fc8972192d637fc42530f993
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2014-10-28 13:05:00 +01:00
Frederik Gladhorn
50bba2fbfb Fix tst_QAccessibility::abstractScrollAreaTest for OS X 10.9
OS X now has a setting (General->Show scroll bars) to use only transient scroll bars.

Task-number: QTBUG-41340
Change-Id: Iffe30e9d601c169d955a380002743bab518f41ea
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2014-10-28 12:56:39 +01:00
Friedemann Kleint
1abcc1cd3d Hardcode UTF-8 for "unicode" in QTextCodec::codecForHtml().
ICU would return a utf-16 (endian dependent) codec for unicode
which is very rarely what people want. In most cases, unicode is
encoded in utf8 these days, so return a utf8 codec for it.

Task-number: QTBUG-41998
Change-Id: I51ee758d520702b263a8b2011787eb1f3455ed96
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-10-28 12:17:13 +01:00
Friedemann Kleint
6080db8c6d Check geometry correctly when replaying popup mouse events.
Task-number: QTBUG-41869
Task-number: QTBUG-39313
Change-Id: I2b59f5db6f0ae4007b1a3b58a79eed958e662272
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-10-28 09:06:43 +01:00
Lorn Potter
44654675ed Do not add invalid configurations to bearermonitor
If the list of configurations takes time in the backend,
the defaultConfiguration will be invalid at this time, but will
be updated by the backend.

Change-Id: I2886a8f6c569c993814172ccaa46e4bb5ba5e0d6
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-10-27 19:14:55 +01:00
Richard Moe Gustavsen
7bda05eb38 iOS: update qtmn doc to use the actual function name
Change-Id: I62b656a317298ec40117017d74fca1be262a66b7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2014-10-27 16:09:07 +01:00
Alexander Volkov
41ece1cbc1 Fix includes in mousebuttons example
Remove QtWidgets from buttontester.h and QtGui from main.cpp.

Change-Id: Ie5925a33c58c1abd9747ab0ab7040e7d1b0769a9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-10-27 15:30:51 +01:00
Gabriel de Dietrich
a198ce8d8f Cocoa QPA Plugin: Remove code depending depending on OS X 10.6 and older
Snow Leopard is unsupported from 5.4.0.

Change-Id: I5c269cbdc93000a4657b63559cc3c526e298e3db
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2014-10-27 15:30:38 +01:00
Gabriel de Dietrich
fc11798e8f QMacStyle: Remove code depending depending on OS X 10.6 and older
Snow Leopard is unsupported from 5.4.0.

Change-Id: I0c49a8353d5dc38169ab9679a986c35ab2df8d2f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-10-27 15:29:16 +01:00
Gabriel de Dietrich
3777618fce QMacStyle: Refactor painter offset into drawNSViewInRect()
Change-Id: I05067ee400f0b776b0f0418ee1c5fbd45126c29e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-10-27 15:28:57 +01:00
Jocelyn Turcotte
0db6230cf6 ANGLE: Delete the ShaderImpl on gl::Shader object destruction.
Cherry-picked from https://chromium-review.googlesource.com/224106

Task-number: QTBUG-41588
Change-Id: I27d75da76cec0b3341f549a3e6891c1c6d321358
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-10-27 15:20:44 +01:00
J-P Nurmi
cd996c1b85 QGtkStyle: fix segfault after re-creating QApp
QGtkStylePrivate::setupGtkWidget() cannot use a local static variable
for the container, but it must insert it to the GTK widget map together
with all other GTK widgets. The container is destructed as a GtkWindow
child in the Qt post routine QGtkStylePrivate::destroyWidgetMap().

Task-number: QTBUG-41145
Change-Id: If1fda372ed1227edc779fa4951cbd6fbf6038499
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Jens Bache-Wiig <jensbw@gmail.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2014-10-27 15:19:22 +01:00
Gatis Paeglis
2b666d9576 Fix shortcut handling with non-latin layouts
Shortcut handling with non-latin keyboard layouts
were broken for checks like:

QKeyEvent key = ...;
key == QKeySequence::SelectAll

In Qt4 this was handled transparently when getting
keysym from XLookupString. When ctrl modifier was set,
XLookupString performed "keysym transformation" to obtain
a latin keysym. Still this did not solve the non-latin
shortcut issues for all cases due to some of Xlib
assumptions which could not be controled by user.

This patch implements XLookupString-like behavior
in lookupLatinKeysym(). It is not a 1-to-1 copy of how
XLookupString perfoms latin keysym lookup, but it
serves our needs just fine. lookupLatinKeysym() also
handles the cases that did not work in Qt4 with
XLookupString, thanks to libxkbcommon keymap query API.

And lookupLatinKeysym() replaces the fragile implementation
of "fallback latin key" code path in possibleKeys().

Done-with: Ruslan Nigmatullin
Task-number: QTBUG-33182
Task-number: QTBUG-32274
Change-Id: I56a5b624487ca6c2c3768220301a37dac39b439a
Reviewed-by: Ruslan Nigmatullin <euroelessar@yandex.ru>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2014-10-27 15:19:02 +01:00
Nico Vertriest
cc1435952d Doc: link to MIBenum
Task-number: QTBUG- 40362
Change-Id: I0261117d8aef8383ef77887a201d61ed0bd0ba52
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-10-27 14:26:36 +01:00
Nico Vertriest
366faaafff Doc: Corrected identifiers for QByteArray::toBase64 in snippet
Task-number: QTBUG-40944
Change-Id: I31fc23739b3e145b3668b10fdf4465c19d2fdb01
Reviewed-by: Martin Smith <martin.smith@digia.com>
2014-10-27 14:26:24 +01:00
Nico Vertriest
10800a3b4c Doc: Corrected autolink errors qtbase
Task-number: QTBUG-40362
Change-Id: I054a4713bdd83280be51697689e0c3c3409b9601
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
2014-10-27 14:26:02 +01:00
Friedemann Kleint
ac4bab991b QSwipeGestureRecognizer: Prevent cancel in startup-phase.
Replace the boolean 'started' member by an enumeration which indicates
the startup phase. While in that phase, do not cancel when pressed
points are detected for fewer than 3 touch points.

Task-number: QTBUG-15768
Change-Id: Ic57b19e3002392fb632f551f615d80ada9831d34
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2014-10-27 14:11:59 +01:00
Gatis Paeglis
4d84c25157 Don't link to Xlib's Xrender library
We don't use this library in XCB plugin.

Change-Id: Ifcc2f404b3cbf5601eb094eaac923d2f9e6e981b
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2014-10-27 13:48:01 +01:00
Rainer Keller
9157087334 Rotate images according to Exif orientation
Task-number: QTBUG-37946
Change-Id: I181f88acdff0ef76aa02e968dc6afca1ed495f38
Reviewed-by: aavit <eirik.aavitsland@digia.com>
2014-10-27 10:30:02 +01:00
Morten Johan Sørvig
be8f647364 Send screen change events before expose events.
This fixes the "expose event received for window
with invalid geometry" warning from Qt Quick. The
window's current screen is now up to date when
processing the expose event.

Change-Id: Ia5c83e34154182699ec587835f9063809d819d7d
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-10-27 10:16:09 +01:00
Morten Johan Sørvig
2d0b251b1d Cocoa: Expose on window size change only
Don't send expose events on window move.

Task-number: QTBUG-42126
Change-Id: I6e758f9037a2a785c651b63d25b53e7a009b1fdf
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-10-27 10:16:00 +01:00
Christian Kandeler
bd94a46f61 QSettings: Fix handling of long long ints with CFPreferences back-end.
The CFNumberGetValue() function does not work as advertised: For some
(but not all) CFNumbers containing a long long value outside the range
of int, it returns true when asked to convert to an int, so the wrong
value is extracted from the CFNumber.
As a workaround, use CFNumberGetType() to find out whether the value
is actually an int.

Task-number: QTBUG-42017
Change-Id: Ib95395491d0db61d2bdc0f058a6a2f6be05da432
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-27 09:52:30 +01:00
Joerg Bornemann
c803af5167 fix crash when dropping a file into an empty QTextEdit
Since commit be0bfe09ee we return -1 in
QTextEngine::findItem if the item cannot be found.
Calling code must be prepared for this case.
Otherwise we run into an out-of-bounds vector access later on.

Task-number: QTBUG-42103
Change-Id: Ie338cd1fc3cf0ce1e8edfa59dead635669020a33
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2014-10-27 10:01:28 +01:00
Alexander Volkov
309e82021d Doc: Include QtWidgets instead of QtGui
Change-Id: Ib7f3183efd446abb7cc191f33128b4e230ee372c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-10-27 09:43:59 +01:00
Daniel Molkentin
631a55ccf4 QStorageInfo: include qt_windows.h instead of Windows.h
This fixes a compilation issue with X-MinGW builds and
is more appropriate here.

Change-Id: Id97e387c6e22a2c09d2f4dda35ce1bed2831fffe
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-27 09:03:05 +01:00
Kai Koehne
5bfe794aaa Remove trailing '\n' in qFormatLogMessage output
Do not automatically add a \n to all messages formatted by
qFormatLogMessage. Some backends require a final newline,
some don't, so it's best to only append it where it's actually needed.

The returned string will be null if the pattern is empty. This allows
to differentiate between the case that the pattern just didn't apply
(empty line is printed), and the case that qSetMessagePattern(QString())
have been called (nothing is printed).

Change-Id: I17fde997a4074f58f82de6dea129948155c322d6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-10-27 08:59:02 +01:00
Rainer Keller
1ffe1a9a7c Allow hostname from lock files to be empty
The common format for lock files is to only contain the PID.
(See http://www.pathname.com/fhs/2.2/fhs-5.9.html)
Qt includes some extra information but we can not expect this
information to be present. Otherwise lock files created by other
(non-Qt) processes are not handled correctly.

Change-Id: Ib9be3c9f07eb8e87193f56d96f5559bbdd5180b8
Reviewed-by: David Faure <david.faure@kdab.com>
2014-10-27 08:47:55 +01:00
Christian Strømme
81998b4e8e Android: Fix android bearer implementation.
1. If the interface used by a configuration changes, remove the whole
configuration and replace it with a new one (instead of updating it).
While this isn't intuitive, this is the exact behavior we used to have
on android when using the generic plugin...

2. Setting the session state to roaming is not correct in this context
as it's a transitional state where we should end up in connected state
(forced roaming). Before this patch we would get stuck in the roaming
state for mobile networks.

4. Use QNetworkInterface::name() instead of
QNetworkInterface::humanReadableName(), as this is the expected
value when querying the interface used.

3. Don't re-iterate through the interface list for each configuration.

Task-number: QTBUG-41832
Change-Id: I315f725434bc6a1a8dca13dffd41f606c87bd06d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-10-27 08:33:07 +01:00
Lorn Potter
0ca0ecdb32 Make networkmanager bearer backend work better
This fixes QNetworkConfigurations when user:
- configures new AP
- deletes connection configuration
- switches wifi AP

Change-Id: I38c543c6de7b61f49d7ac96fa05f7a6fc4fba70f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-10-27 05:32:58 +01:00
Morten Johan Sørvig
6c308e6f1d Add OS X platform changes.
Change-Id: Ib685a2c9a012bbd73b0da99eabce3a0cd0b21358
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-10-26 22:26:16 +01:00
Frederik Gladhorn
18a538ed40 Add searchEdit as accessible state
The search state is used by VoiceOver on iOS to announce a search field.

Change-Id: I464125827dbbf275daf38104e26e9591bb23365a
Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
2014-10-25 18:30:08 +02:00
hjk
e859de3fb5 Add extra declarations to make rcc output pass -Wmissing-declarations
The previously produced code was valid C++.  Add the declaration
nevertheless to help people who want to use the switch in their
own code.

Task-number: QTBUG-42119
Change-Id: Ia47cf3930684474ff65e5cf37335d7d7f57a1d31
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-10-25 11:48:43 +02:00
Samuel Nevala
3f9dbc0ec8 Android: Keyboard doesn't hide from done button
QLineEdit commits and hides QInputMethod on enter key press. When
Qt::ImhMultiLine input method hint is set, virtual keyboard is not
hidden.

Task-number: QTBUG-37850
Change-Id: I018351caa18bd2116665771e5f024a57182a01b9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-10-25 07:19:35 +02:00
Tor Arne Vestbø
27a321e1ed iOS: Make room for zero-terminator when building argv from NSProcessInfo
[NSString lengthOfBytesUsingEncoding] only returns the number of bytes
required for the actual string, not including the zero terminator, so
when we then used cStringUsingEncoding to fill the malloced buffer with
data, we overwrote the byte after our buffer with 0, resulting in random
and hard to reproduce crashes at application startup, seemingly depending
on the application name.

Change-Id: I35d261bea5924e917475b0270bfa280bfb0c787a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2014-10-25 00:20:21 +02:00