Commit Graph

16232 Commits (f3e220d4c2383f3f20eb60f260cf40308a98ec00)

Author SHA1 Message Date
Fatih Aşıcı f3e220d4c2 Set loadAcquire() as const to fix powerpc build
Change-Id: Ica1ea565e7eefd2ef378737eb9687ebbf4adf7b0
Fetched-from: https://bugzilla.redhat.com/attachment.cgi?id=812643
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-11-29 18:48:10 +01:00
Laszlo Agocs dc9e32caed cocoa: Use swapInterval from QSurfaceFormat
xcb and windows already do this. The default value is 1 so the
behavior on cocoa does not change when setSwapInterval() is not
called.

Task-number: QTBUG-31939
Change-Id: Id9d9204c9324f1cc187c6aee4286e7da42583759
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
2013-11-29 10:26:02 +01:00
Marc Mutz 7308af8ca7 QSimplex: make non-polymorphic
This class is never inherited from, so save the vtable, and
everything that goes with it (typeinfo, ...).

Effects on Linux AMD64 GCC 4.9-trunk release stripped:
  text:   -248B
  data:    -64B
  relocs:   -5

Change-Id: I12eec1115529eb3fc873fb9a9aacc150d9937fb9
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-11-28 23:13:14 +01:00
Marc Mutz 5d9cddd24c QSimplex: API cleanup [3/3]: add inline keyword
The functions valueAt() and setValueAdd() were defined inline out-of-body,
but not declared inline. Fix by adding inline to the declarations, too.

This has in the past caused warnings on exported classes on MinGW, and it's
simply wrong, too.

Change-Id: I5922cb9ca0c5ee37408f553f0aad0e3264853827
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2013-11-28 23:12:35 +01:00
Marc Mutz 80cfb9b8f1 QSimplex: API cleanup [2/3]: disable copying
QSimplex is not designed to be copied, so disable explicitly.

Change-Id: Ia1ddcfe905380e594930717c7c55bb38a7dd4059
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
2013-11-28 23:12:28 +01:00
Jan Arve Saether 66b7e7497c Add test for default (style dependent) spacings
Task-number: QTBUG-35099
Change-Id: If19d3ccf7177dcbecef30b3ba1e16b022a3d54c4
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2013-11-28 15:29:44 +01:00
Marc Mutz 6f54244660 QLineEdit: Extract Method shouldShowPlaceholderText()
The condition under which the placeholder text should be shown changed recently,
so refactor the code to centralize the condition.

It turns out that setPlaceholderText() and paintEvent() disagree on the condition
already.

Change-Id: Id193a9a138042ab0690082dcf634cf7487a5276e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-11-28 11:34:33 +01:00
David Faure 1c046369e3 tst_qthreadpool: fix memory leak
Task-number: QTBUG-22673
Change-Id: I2e554a2ad0119b5f9ce2d36e4720538af5ef6b82
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-11-28 09:14:11 +01:00
Frederik Gladhorn 4a8273a6fc Merge remote-tracking branch 'origin/stable' into dev
For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
2013-11-26 22:35:48 +01:00
Andrew Knight 1c2be58fec 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>
2013-11-26 20:29:09 +01:00
Friedemann Kleint 75a7562491 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>
2013-11-26 20:29:09 +01:00
John Layt db4afbef7d 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>
2013-11-26 18:45:10 +01:00
John Layt 42fa59b151 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>
2013-11-26 18:44:50 +01:00
Marc Mutz 036c5db468 QString: add missing contains(QLatin1String) overload
Since contains() just wraps indexOf(), which has a QLatin1String overload,
add one for contains(), too, for consistency.

[ChangeLog][QtCore][QString] Added QLatin1String overload of contains()

Change-Id: I2acc628a51e00789fb2b90400cf0c523a5b5e65a
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-11-26 17:15:46 +01:00
Marc Mutz e672cc3453 Change format of dist/changes-5.3.0 to what is used in changes-5.2.0
Change-Id: I9c11a126a70c25085f1465e2593bb878c736f8b4
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2013-11-26 17:15:34 +01:00
Friedemann Kleint 0da841bc33 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>
2013-11-26 11:29:54 +01:00
Joerg Bornemann 58f0a9ba5a 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>
2013-11-26 11:22:17 +01:00
Erik Verbruggen b84072a431 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>
2013-11-26 11:05:36 +01:00
Frederik Gladhorn 3061dc4abd Merge remote-tracking branch 'origin/release' into stable
Change-Id: I83ff8f4d7dffd7385013a1bd8a1732a89ee20d56
2013-11-26 10:51:34 +01:00
Olivier Goffart 9b8570c4e9 Fix deadlock when disconnecting connections made with function pointers
The regression was introduced in 5885b8f775

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>
2013-11-26 08:29:41 +01:00
Thiago Macieira df449d4f86 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>
2013-11-26 08:24:44 +01:00
Thiago Macieira 10ac0bb2b8 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>
2013-11-26 08:24:41 +01:00
Thiago Macieira c9857bdeef Update ChangeLog for 5.2.0 [QtDBus]
Change-Id: I8b58ea636eac2be4da967c18057c38990bc9178f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-11-26 08:24:37 +01:00
Olivier Goffart f805020410 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 5885b8f775

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>
2013-11-26 08:24:25 +01:00
Dmitry Ashkadov 4a9092eaad Add QVERIFY_EXCEPTION_THROWN macro for testing exceptions using QtTest
New macro QVERIFY_EXCEPTION_THROWN may be used to check that some code
really throws an exception of specified type.

Change-Id: I7cf499c7c37a35407862bc604c6eb862c5f329d3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
2013-11-26 07:37:06 +01:00
Allan Sandfeld Jensen 25b2b682d6 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>
2013-11-26 00:13:36 +01:00
J-P Nurmi 41ecf56cf7 src/gui/text: whitespace fixes
Change-Id: Idd0e0673d76a23593b03558e18bc6afbdb9b38ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-26 00:05:46 +01:00
Tor Arne Vestbø c2f08598e1 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>
2013-11-25 23:56:40 +01:00
Tor Arne Vestbø 6820ac594a 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>
2013-11-25 23:56:37 +01:00
Tor Arne Vestbø 8f32476542 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>
2013-11-25 23:56:34 +01:00
Tor Arne Vestbø 6318a6879d 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>
2013-11-25 23:56:30 +01:00
Eskil Abrahamsen Blomfeldt 7201148be0 Revert "Android: Use native platform menus."
This reverts commit 98f0b46689.

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>
2013-11-25 23:56:27 +01:00
Richard Moe Gustavsen b61928e646 iOS: close keyboard upon hitting key 'done'
Change-Id: I0098cc4d51ca600ba48baa15ed9c16e56529b947
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-11-25 23:56:25 +01:00
Thiago Macieira e8f9533d4d Update ChangeLog for 5.2.0 [QtCore]
Change-Id: I2f6adc13d454825a2f444121a87dfd189e1c70f9
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-11-25 23:56:17 +01:00
Marc Mutz 1f10476866 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>
2013-11-25 23:56:14 +01:00
Thiago Macieira 1073d38617 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>
2013-11-25 23:56:09 +01:00
Bernd Weimer 5d8c05baf4 QNX: Make use of _readdir64_r
Latest QNX versions support _readdir64_r. It will be used by
QFileSystemIterator now, when available to support large file
systems.

Change-Id: I40135f405ad72e1ba85c6a4cd282144dd8171bc6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
2013-11-25 18:15:35 +01:00
Oswald Buddenhagen 40290b06d3 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>
2013-11-25 17:11:26 +01:00
Richard Moe Gustavsen 484d6ce776 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>
2013-11-25 17:11:26 +01:00
Richard Moe Gustavsen bdf0670c02 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>
2013-11-25 17:11:26 +01:00
Richard Moe Gustavsen 99474206f4 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>
2013-11-25 17:11:26 +01:00
Richard Moe Gustavsen 0bfc1c8647 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>
2013-11-25 17:11:26 +01:00
Richard Moe Gustavsen 953d85e049 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>
2013-11-25 17:11:26 +01:00
Andy Nichols 344a7c540b iOS: Do not skip building QtGraphicalEffects module
The QtGraphicalEffects module is a QtQuick2 only module so it is clear
why it was left out before iOS had support for QtQuick2, but now it
should be built by default.  This commit removes QtGraphicalEffects from
the iOS module "skip list".

Change-Id: Ie0890f6784ad6e276e80bf7a11195c141ca23332
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-11-25 15:09:44 +01:00
Andy Nichols 0835859dd5 iOS: Do not skip building QtQuickControls module
The QtQuickControls is supported for 5.2 though it does not provide
the system native "look and feel".  This patch removes the module from
the iOS module "skip list".

Task-number: QTBUG-35033
Change-Id: Icad479f2e4651c02e569e8a86cfe5ac912d8ed10
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-11-25 15:09:40 +01:00
Andy Nichols d86f045082 iOS: Do not skip building QtMultimedia
QtMultimedia is supported in Qt 5.2 and should be built by default, so
it has been removed from the module "skip list"

Task-number: QTBUG-35039
Change-Id: Id43f997251bf392b7f6c0166ee06b7364ce30b8e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2013-11-25 15:09:36 +01:00
Oswald Buddenhagen 63606d6a39 simplify setting XPLATFORM_MINGW
no need for a separate case block.

Change-Id: I8e9f460bc28ea29ff688fde0d777b168440196e1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-11-25 14:28:17 +01:00
Oswald Buddenhagen dac5fbaa2d move android variable initialization to a sane place
it's beyond me how it landed in the middle of the sql driver detection.

Change-Id: I7d1302e3440b8828a291e3009e9b130a2fdf165f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-11-25 14:28:14 +01:00
Oswald Buddenhagen f604c94f18 make distclean actually remove the static library target
Task-number: QTBUG-3883
Change-Id: I288d830d6f73c69401ba81a70f35ee511e31bed5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-11-25 14:27:58 +01:00
Gabriel de Dietrich 7e5bd5edfc Mac style: Fix pressed tab appearance
Change-Id: Ib2bfc5afcb4d1a9fa20f5b1ec90c4c239a97954e
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-11-25 13:46:56 +01:00