Commit Graph

20680 Commits

Author SHA1 Message Date
Kai Koehne
6c58c9b3ec clang: Fix compilation with -openssl-linked
Fixes errors like

qsslsocket_openssl_symbols.cpp:111:6: error:
      unused function 'qsslSocketUnresolvedSymbolWarning'
      [-Werror,-Wunused-function]
void qsslSocketUnresolvedSymbolWarning(const char *functionName)
     ^
1 error generated.

Change-Id: I164518de583f080724ab9a7165c885602a1c6231
Reviewed-by: Richard J. Moore <rich@kde.org>
2014-10-30 10:52:32 +01:00
Kai Koehne
51ec20d93e Load default codecs even if custom QTextCodec has been registered
Task-number: QTBUG-40378
Change-Id: I33f1e92127972e1346993aa4e07731bf4b697667
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-10-30 10:52:11 +01:00
Gabriel de Dietrich
c9b49612ff QMacStyle: Several fixes for QtQuick Controls on Yosemite
Some offsets differ between QWidgets and Controls. Therefore, we need
drawNSViewInRect() to know about the origin of the call.

Change-Id: I3bd165f94731f2b37423d86ed5d3c302a17d5ef5
Task-number: QTBUG-42067
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-10-30 10:49:30 +01:00
Gabriel de Dietrich
3f3955fec5 QMacStyle: Fix QCombobox offsets in Yosemite
Task-number: QTBUG-40833
Change-Id: Id3c3f4fd4f5c72cba844bf23f2e79ce0ea2b4a95
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-10-30 10:49:22 +01:00
Albert Astals Cid
a860500f8e Adapt the names in the documentation to the names used in the header
This is needed since the names of the header are the ones you have to use in the QML signal handlers to access the variables

Change-Id: I507e2ccc05a1fd2c5efd0bf4bef92ed33a186d95
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-10-30 09:52:04 +01:00
Samuel Gaist
6ee73677b2 Correct QStandardPaths::DataLocation return value for iOS
Currently DataLocation returns the same value as DocumentsLocation which
doesn't fit the purpose for what should go in this directory. This patch
aims to correct that. On a side note, it will also be more inline with
OS X current behavior

[ChangeLog][QtCore][iOS] Fixed path to QStandardPaths::DataLocation.
Until now DataLocation was pointing to the Document directory. With this
patch, it will return the more accurate Library/Application Support.
Application making use of DataLocation should move these data to the new
location. This can be done using the path provided by DocumentLocation as
source path.

Task-number: QTBUG-42276
Change-Id: I35415643cf8cc7a60528f9b0fb5028ada5deace0
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: David Faure <david.faure@kdab.com>
2014-10-30 09:38:23 +01:00
John Brooks
136ccaa276 Ignore alert on an active window
When QWindow::alert() is called with a duration of 0, it calls
QPlatformWindow::setAlertState(true), and expects the alert state to be
reset when the window is next activated. Other calls to alert are
ignored while alertState is still true.

If alert was called for an active window, it would remain in the alert
state until deactivated and activated again, and on some platforms calls
to alert would be broken while deactivated.

Alerting doesn't make sense for active windows, so we can simply ignore
it, which was the behavior with Qt 4 on some platforms.

Change-Id: Ia3324da4c89db711b63eb31cddf0bf742bb4e3b8
Found-By: Jan Noertemann <jan.noertemann@uni-dortmund.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Martin Gräßlin <mgraesslin@kde.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2014-10-29 21:11:58 +01:00
Shawn Rutledge
0b49ce2f8e Android: QtActivitiyDelegate: extras can be null
Change-Id: I3b31cc499067540e6ad7b6d05df75d9ba0e1e615
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-10-29 21:10:59 +01:00
Laszlo Agocs
ec103617c2 eglfs: Remove unused member variable
Change-Id: I45cdf79c14b823b3e93ed0e0923cb687a0ea17c7
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
2014-10-29 20:46:13 +01:00
Kai Koehne
c99b93e55c QTextCodec: Fix source code indentation
Change-Id: Ia9a79e659e028eb6173a7adef12d4973f78c32e9
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2014-10-29 16:09:34 +01:00
Shawn Rutledge
824f01af8f fontconfig: do not assume the path to a font file is Latin1-encoded
Task-number: QTBUG-42249
Change-Id: Ie5d41ed26a69103991a5189c4f42aa37ac73de26
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
2014-10-29 10:49:56 +01:00
Shawn Rutledge
3d5fb54eda Cocoa: Handle Qt::WA_MacAlwaysShowToolWindow
Forward the flag to QWindow by setting the _q_macAlwaysShowToolWindowproperty
on the window in QWidgetPrivate::create_sys(). Test
for the property when creating the window.

Task-number: QTBUG-29816
Done-with: Morten Sørvig
Change-Id: Id810dda98d02deb0902192cce1783d8b16b04d04
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-10-29 10:33:44 +01:00
Liang Qi
933fab137d Cocoa: Fix regression in key handling
The text should be empty when Cmd key is in modifiers.

Task-number: QTBUG-36281
Change-Id: Ic71e532695ad4a947c86e8d21ae864d70f9afa4c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-10-29 10:14:15 +01:00
Alexander Volkov
100ed0c01d xcb: Fix getting the primary screen from QXcbConnection::screens()
Currently getting QXcbScreen* for primary screen is too messy and it
wrongly uses QXcbConnection::primaryScreen() as an index in
QXcbConnection::screens() although QXcbConnection::screens() returns
the primary screen as the first item in the list since
3c8eb40487.

So to clear the API rename primaryScreen() to primaryScreenNumber(),
add QXcbConnection::primaryScreen() that returns correct QXcbScreen*
and use it directly.

Change-Id: Icb7391aa3e82b32ca48f2bda764dcf7ffd89cc47
Reviewed-by: Uli Schlachter <psychon@znc.in>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-10-29 10:03:55 +01:00
Morten Johan Sørvig
6c38a82aa8 Cocoa: Send obscure events on OcclusionStateHidden
This disables animations for windows that are
completely obscured by other windows.

On examples/quick/animation, obscured CPU usage goes
from 10% to 1%. There has been reports of 100% CPU
usage with Qt before this patch.

Change-Id: Iefea43ed8c1cfaa2df13f1f5a4e4450146ade522
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
2014-10-29 09:39:31 +01:00
Jørgen Lind
14e51127cf Add qobject_cast template specialisation for QWindow
greatly improving the performance of qobject_cast<QWindow *>

Change-Id: If5a1afa6e41f4676f4838ea3ff80f1d89e396dfc
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
2014-10-29 09:39:23 +01:00
Oswald Buddenhagen
87eb3ea190 work around MSVC2010 ICE
Task-number: QTBUG-42064
Change-Id: Ifffcc0cf9109b76d79f603a13792d7fd9979761c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-29 09:37:17 +01:00
Oswald Buddenhagen
e1ff27ca28 add support for explicitly declaring the module master header
when a module delegates to another module (as the activeqt ones do), it
doesn't have a master header to be included. we could derive the real
master header by doing a transitive dependency resolution and some
filtering, but that seems unnecessarily complex.

Task-number: QTBUG-41892
Change-Id: Ie7ce51a837ac06e929b204ec734206c11b3ae241
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-10-29 09:37:08 +01:00
Oswald Buddenhagen
4b491334cf Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4 2014-10-29 10:55:33 +01:00
Bjoern Breitmeyer
7ebc151bcf Fix X86 Wince builds.
Windows CE does not have all _BitScanReverse
intrinsics, so disable those for Q_OS_WINCE.

Change-Id: I34a3c02c6ffdfff2a209b2c9c1b80bef4566ee39
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-10-29 09:26:37 +01:00
Allan Sandfeld Jensen
a0bdbc1442 Fix QWidget::scroll during painting
Calling scroll during painting fails in cases where the scroll is
attempted accelerated. This is easily fixed by not using accelerated
scrolling during painting.

Task-number: QTBUG-41615
Change-Id: I38d2428d5679c242f13d53793a3dc3b8e01b538f
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-10-29 09:25:12 +01:00
Marc Mutz
11e09a440b tst_qvariant: automate testing of forward_list
...using the SD-6 __has_include macro.

Change-Id: I629e2ad1c8090aba9e86ab9febf6d09a504219f9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-10-29 09:18:21 +01:00
Lars Knoll
38c2e3d104 Properly detect UTF-8 BOM markers in ini files
If we detect a utf8 BOM mark at the beginning of the .ini
file, skip the marker and set the iniCodec to utf8.

Task-number: QTBUG-23381
Change-Id: I1b37fc4f1638a48e4f3ee71ab165e2989bc592f1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-10-29 08:58:31 +01:00
Alexander Volkov
ad1ec8b57d xcb: Fix setting the alert state for a window
Send a _NET_WM_STATE client message to the root window
instead of changing the window property.

Task-number: QTBUG-41310
Change-Id: I864af0158ec55796bb3cbc123469709b2be54ec8
Reviewed-by: Martin Gräßlin <mgraesslin@kde.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
2014-10-29 08:29:45 +01:00
BogDan Vatra
3203601315 Fix QLocalServer, create a temp path as small as possible.
If requestedServerName is a full path e.g. "/tmp/some/long/path" the
temp path will end up "/tmp/some/long/path.balblabla/tmp/some/long/path"
and it might fail because it doesn't fit in addr.sun_path.

Change-Id: I6a138fd92be9e0b3b432ab9ac977d04cb330f3fd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-10-28 21:30:18 +01:00
Allan Sandfeld Jensen
23553cccda Fix justification in multi fontengine glyphruns
QTextLine::glyphRuns was not handling justification when splitting
glyphRuns due to multiple font-engines. This patch adds the missing
justification.

Task-number: QTBUG-41901
Change-Id: I02d24218630506da21531a6499784dff2eecdf6f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2014-10-28 21:03:39 +01:00
Lorn Potter
b1d3f1fec0 QtBearer corewlan add list of remembered networks
These should be at least Defined by the system even with wifi power off

Change-Id: I0964ba82fe3fab98585ea7771687cef4d1b70cf9
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-10-28 20:26:57 +01:00
Tor Arne Vestbø
a8ed001f36 iOS: Properly detect arm64 builds when choosing which -arch flags to pass
Change-Id: Ib410584ba2c1fe342efb18eb955273090d36db8f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2014-10-28 19:46:03 +01:00
Olivier Goffart
27d79ce91b moc: do not error if the last token of a define is #
We do not need to emit a diagnostic at definition time.
The diagnostic will be emit at expansion time.

Fix error when parsing boost header:
/usr/include/boost/fusion/container/vector/vector.hpp:25: Error: '#' is not followed by a macro parameter

Task-number: QTBUG-42233
Change-Id: I27deab362341f17ca3b0160615bb1b0934c3d5c3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-10-28 19:37:10 +01:00
Jerome Pasion
7567e09389 Doc: Updated thumbnail images for some examples.
-Application Example
-Analog Clock
-Analog Clock Window
-Scribble
-Digital Clock

-Thumbnail images were created with an obscure window manager and
they look out of place in the Welcome Mode in Qt Creator.
-Used Windows 7 as the platform.
-Images within the documentation not updated because they are still
relevant.

Task-number: QTBUG-33597
Change-Id: I255fc4960e9adcec273f21287ef2182656c6b007
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-10-28 19:31:53 +01:00
BogDan Vatra
aa4d76e468 Remove redundant permission set.
The temp socket is in a safe place. There is no need to set any
permissions at this point.

Change-Id: I18ea4b71b7c20db65dc46c57ddc5d34d8b93f577
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-10-28 19:15:46 +01:00
BogDan Vatra
4b8d4034d7 Removed pointless conditional.
Mode is always != 0 at this point (QLocalServer::WorldAccessOption is
a combination of the bits tested later).

Change-Id: I5abfb4e49fdc7903e21398525af05989f40d7f94
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-10-28 19:15:39 +01:00
BogDan Vatra
80d31849e2 Fix indentation & coding style.
Change-Id: Id974abca3ee2be9cb70c380a842e76c0ba1520bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-10-28 19:15:32 +01:00
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