Commit Graph

18615 Commits

Author SHA1 Message Date
Giuseppe D'Angelo
7d2565b4bc Import PCRE 8.35
Change-Id: I03923fd8ad634857963521502febfb494a072c7d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-24 02:45:31 +02:00
Giuseppe D'Angelo
bee0f1832b Adapt the PCRE import script to the PCRE 8.35 tarball
Change-Id: I34cef10739af2a4bf04cae5f66ee7219b9afe868
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-24 02:45:31 +02:00
Keith Gardner
6fc7d76e73 QSignalSpy: Added template function pointer constructor
Added the function pointer constructor to QSignalSpy to take advantage
of the new connect syntax.

Change-Id: I94218a096c677cdba73e1b2cfa8b9c09bc28145f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
2014-04-23 22:26:00 +02:00
Jorgen Lind
eb88aaa3a2 Introducing QPixelFormat
Its purpose in life will be to describe pixel formats

[ChangeLog][QtGui] Added QPixelFormat class

Change-Id: I74d8f974606520efb3935110ff3d6ddb5ea805a8
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-04-23 21:43:50 +02:00
Jędrzej Nowacki
33fae8b147 Build fix for auto-registration of Container<void*>
IteratorOwner pointer specialization was failing for void* because of
an invalid function overload.

Change-Id: I80355ddd2b871c1fa2fa5bf5a4ed8bc7768fc3c9
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2014-04-23 21:40:36 +02:00
Jani Heikkinen
54c1e5ed22 Merge remote-tracking branch 'origin/release' into stable
Change-Id: Id13b4a3803664692f32f9d57549be8a0c4a08567
2014-04-23 12:42:48 +03:00
Tor Arne Vestbø
b0d996aed1 Build Qt tools for iOS
Change-Id: Ie3dc93e01ed878233c8094ca92bef25a6cf4dcd9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
2014-04-23 06:31:08 +02:00
Friedemann Kleint
1cb0cd9e7a Windows printer support: Fix linking problem when built with -no-opengl .
Add missing libraries that were otherwise pulled in by opengl.prf.

Task-number: QTBUG-38431
Change-Id: I1705d432088a47b5a202595e818e9efcd5f6a4cf
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
2014-04-23 06:31:04 +02:00
Konstantin Ritt
aeb0d58782 Fix warning with -Wswitch-enum
> warning: enumeration values 'Joining_None', 'Joining_Left', and 'Joining_Transparent'
> not explicitly handled in switch [-Wswitch-enum]

Change-Id: I314b486462451e7d62980b6185b46cd115be1547
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2014-04-23 06:31:00 +02:00
Andrew Knight
c97edb2579 WinRT: Handle back button as press or release
Earlier, only the back press was checked for acceptance. By also checking
the release event, this makes the backstepping behavior consistent with
Qt for Android, and fixes the expected behavior found in our demo
applications.

Task-number: QTBUG-35951
Change-Id: I9c2f18816b838d57713ba4dd3624e2f3f1ac40ac
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-04-22 13:54:42 +02:00
Andrew Knight
878da15f2c ANGLE WinRT: Call Trim() when application suspends
This is required by Windows Store Apps to pass certification.

Task-number: QTBUG-38481
Change-Id: I6dc00431ee5f6c7d4c64111ccc38f46483d3b9a8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
2014-04-22 13:54:38 +02:00
Andrew Knight
078c71ac8f WinRT: Fix TCP socket reads
All read calls are now pulled from an intermediate buffer which is
populated from the asynchronous callback (this was a TODO previously, and
was breaking downloads of large requests). As a side-benefit, the use of
only async callbacks ensures fewer first-chance exceptions appear in the
debug output.

Task-number: QTBUG-30196
Change-Id: I5653742d8d94934a4b4a4227298865d20518bc4c
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-04-22 13:54:34 +02:00
Stephen Kelly
969da85c2b QMetaType: Specialize IsPointerToTypeDerivedFromQObject for const void*
'const void' is not derived from QObject, and is not a type we can use
sizeof to determine that.

Change-Id: I008f444bbed9fc8f9147da0f7f336757f660e224
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
2014-04-22 10:19:27 +02:00
Richard J. Moore
207598fd8e Fix copy-paste error.
Fix an error identified by static analysis from
http://www.viva64.com/en/b/0251/

Change-Id: I3b69f8eb8c9e10772d5ca2afad75582e8a54beb7
Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2014-04-18 14:26:26 +02:00
Richard J. Moore
22bb244d6d Fix copy-paste error.
Fix copy-paste error identified by static analysis at
http://www.viva64.com/en/b/0251/

Change-Id: I214d6bf8494a946a6c772b6dca1395e4140a471f
Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
2014-04-18 14:26:26 +02:00
Richard J. Moore
4a28205bed Fix copy-paste error.
Fix copy-paste error identified by static analysis at
http://www.viva64.com/en/b/0251/

Change-Id: I2e454c2e7535924dd533c0ceb4fd2283a8f9862f
Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
2014-04-18 14:26:26 +02:00
Gabriel de Dietrich
c7bd85e97d Cocoa: NSMenu views never get viewDidUnhide called
This is the case for QWidgets added as native menu items with
QWidgetAction. According to Cocoa's documentation [1], we should
rely on -[QNSView viewDidMoveToWindow] instead.

On 10.9 however, we receive NSWindowDidChangeOcclusionStateNotification
from the NSMenu window, which is preferable to using -[QNSView
viewDidMoveToWindow] as it guarantees the view is actually visible.
We do runtime symbol lookup to get this to work on 10.9 regardless
of the build SDK version.

[1] https://developer.apple.com/library/mac/documentation/cocoa/Conceptual/MenuList/Articles/ViewsInMenuItems.html

Task-number: QTBUG-19840
Change-Id: If4676df5d79c359965f09ef2e5eddf4c925e3533
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-04-18 11:05:25 +02:00
Morten Johan Sørvig
13e3f269fd QPrintDialog - Fix Mac reference counting error.
"key" is accessed with a "Get" function and should
not be released. Switch from using QCFString to a
CFStringsRef.

Change-Id: Id4eecc642de8698314fc57d44af05c202966b11c
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: John Layt <jlayt@kde.org>
2014-04-18 07:45:19 +02:00
John Layt
4e4b2d6701 QPrintDialog - Fix mac change of printer name
If the user changes the printer name in the Mac print dialog then
update the print device in QPrint to reflect this.

Task-number: QTBUG-37808
Change-Id: I3aaf27e2db7277ab083dc8f8d59f0f80ecd424f1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-04-18 07:45:11 +02:00
Paul Olav Tvete
6e26bd5fa2 Android input method fix
Let textBeforeCursor return the text immediately before the cursor,
and not the text at the beginning of the paragraph, even if that is
also technically before the cursor. (Apparently I do not know the
difference between left and right.)

Change-Id: I6043ebe53838e68880b6407dbb9e5370bc785c1b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-04-18 07:45:04 +02:00
Oswald Buddenhagen
dcfd36c268 Revert "Automatically link printsupport plugins to static applications."
It has been fully obsoleted by 4255ba40ab.

This reverts commit 99eecab83d.

Change-Id: Id7b8d3bba27ff43e38e4fe32a4f2950de9ced493
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
2014-04-18 07:44:57 +02:00
Gabriel de Dietrich
454dc332b3 QPA: Adding API to support QWidgetAction on Mac
Includes the Cocoa implementation.

Task-number: QTBUG-19840
Change-Id: Id33bc8053b82116cf76ed591b6df823df3aef9bc
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-04-17 18:56:27 +02:00
Gabriel de Dietrich
5ad594a061 QMacNativeWidget: Fix background rendering
The widget's background is transparent, but Qt is not owning the
backing store in this case, so we must make sure it gets properly
cleared and flushed.

Task-number: QTBUG-19840
Change-Id: I1087ce80aae3620d64a8c180129d79b5b022750b
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-04-17 18:56:27 +02:00
Joerg Bornemann
c4c9883d13 fix read notification in QWindowsPipeReader::waitForPipeClosed
In QWindowsPipeReader::waitForPipeClosed we must check for available
bytes in the internal buffer and trigger the notified signal.

This fixes tst_QLocalSocket::writeToClientAndDisconnect on Windows.

Change-Id: I0f4d6cd73a0a8eac5b438b82984457068a9551d1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-04-17 18:56:27 +02:00
Paul Eggleton
0c3301f0b1 configure: make pulseaudio and alsa configurable options
Allows disabling pulseaudio and alsa support at configure time
making builds more deterministic.

Change-Id: I4f1719cf831458b1d5ad3ebc01f6782b897d392c
Reviewed-by: Martin Jansa <Martin.Jansa@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-04-17 14:56:07 +02:00
Martin Smith
9b8dd3012c qdoc: \l now works with QML property groups
This update makes it possible to link to the name of a
QML property group with a \l command. e.g. \l {Item::anchors}

Task-number: QTBUG-35844
Change-Id: I2dc51bd90eadd13754a8f4d3357f3f17605a068d
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
2014-04-17 14:27:07 +02:00
Shawn Rutledge
d449c0e0e4 When a window loses focus to a popup, event has PopupFocusReason
Followup to debe31e047 : a popup
window can have focus, but a QQuickWindow needs to know why
it loses focus when a menu is opened, so that for example
copy/cut/paste Actions can apply to the text which did have
focus before the menu opened.  The event's focus reason provides
enough information to deal with this situation.

Task-number: QTBUG-36292
Task-number: QTBUG-36332
Change-Id: Ifae999a364a61b125a4764c9db204a167bddf0b7
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2014-04-17 10:59:47 +02:00
Laszlo Agocs
4dbef58c3d Restore Qt 4 behavior in default double click handler
Revert 3bb9024952. That fix was an attempt
to handle the issue that has been fixed in 5.3 by
9063edef79 and should have been reverted
when the new approach, that restores Qt 4 behavior for widgets, was
introduced.

Task-number: QTBUG-38242
Task-number: QTBUG-36423
Change-Id: I8f8a82da22605fac90543492e9b2cd2b568544e7
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-04-17 10:59:13 +02:00
Laszlo Agocs
7aac93b6ce Remove internal public function from QOpenGLFunctions
QOpenGLContext uses glGetTexLevelParameteriv on desktop OpenGL and so it
got recently added to QOpenGLFunctions as part of the dynamic GL loading
support.

This is unnecessary since such desktop-only code can use the versioned
wrappers (QOpenGLFunction_1_0 for example). In related upcoming changes
in 5.4 the function is removed. This change has to be backported to 5.3
to prevent introducing this public API unnecessarily.

Change-Id: I6fc331091e4e6416e430bf985afcc17a392fc2e3
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
2014-04-17 10:59:03 +02:00
Sze Howe Koh
329752517c Doc: Improve docs for file permission checking on NTFS
- Reduce verbosity in qfiledevice.cpp
- Copy to qfileinfo.cpp

Task-number: QTBUG-35232
Change-Id: I4b0de36bdf266ebf486f73daecec8fbb74fa1d4c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2014-04-16 18:21:36 +02:00
Gabriel de Dietrich
efa7a5a659 Cocoa: Force menubar update after inserting a new menu
Task-number: QTBUG-38135

Change-Id: I7bb9f41789cc77c26a9623d69c28e3ad1607bb9c
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
2014-04-16 15:21:50 +02:00
Stephen Kelly
154b35e8c0 CMake: Include the definition of the Qt5::AccessibleFactory target.
The file will not exist if the accessible plugin is not built.

Task-number: QTBUG-37849
Change-Id: I2983d01a085b11737bf49805edab5ca33fb5174a
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2014-04-16 15:21:50 +02:00
Stephen Kelly
a420c6e838 CMake: Include the CMakeParseArguments module for dbus macros.
The cmake_parse_arguments macro is used already in the file. The
module happens to already be included via Qt5CoreMacros, so the
existing code is not currently a problem.  Add the include to
comply with 'include what you use' and to ensure that it continues
to work even if Qt5CoreMacros is changed in the future.

Change-Id: I7369261bce9d0e58488e584ef0743e33e9f9ec9e
Reviewed-by: Volker Krause <volker.krause@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
2014-04-16 15:21:50 +02:00
Bernd Weimer
2ba9a2584f Fix polling file system watcher addPaths
Fixes QFileSystemWatcher::addPath() auto test when polling file system
watcher is in use: adding the same path twice should fail.

Change-Id: I2a0df3ffa587fa90fae744858f4471d667443e6f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
2014-04-16 15:21:50 +02:00
Louai Al-Khanji
d0cf69eaff Direct2D QPA: Fix text drawing with brush but no pen
We were incorrectly bailing out early in the text drawing code when there
was no pen. This is incorrect as drawing with only a brush should be
possible.

Change-Id: I94eaadd3cf6c4d82033b5d74d7ca47a05601083f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-04-16 15:21:50 +02:00
Louai Al-Khanji
0c95332f8f Direct2D QPA: Refactor code to reduce code duplication
Refactor duplicate logic in painterPathToPathGeometry and
vectorPathToID2D1PathGeometry into one utility class. At the same time
make the naming of the two functions consistent with each other.

Change-Id: I03c8fc183863473b7337223e51835cf080914a41
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-04-16 15:21:50 +02:00
Louai Al-Khanji
7d0f4dde06 Direct2D QPA: Optimize rectangle fills.
Detect rectangle hints in the QVectorPath and react accordingly.

Change-Id: Ic72ce0c46d10e995c0824972854e2d88162eae45
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-04-16 15:21:50 +02:00
Louai Al-Khanji
f961425256 Direct2D QPA: Improve gradient support
This change adds support for those gradients which can be expressed using
Direct2D. At the moment this means linear and radial gradient with pad
spread only.

Change-Id: Ib1b1bc38a793dd826a259bbf8a7b31c25906dd59
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-04-16 15:21:50 +02:00
Tasuku Suzuki
cd21b56c9d remove context unmatched warning in QOpenGLTexture
destroy() or destructor complain when QOpenGLTexture is not created or
it is already destroyed.

Change-Id: I6b3135849e3ba2ce35678fcdbf1c9b6e588a063c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
2014-04-16 13:29:12 +02:00
Andrew Knight
8b0fd78caa WinRT: Don't use the native thread handle for waiting
There is no guarantee that the handle from std::thread will be valid
when a wait is made. Instead, simply use an elapsed timer and check
if the thread is finished. This prevents an exception from being thrown
when a bad handle is encountered.

Task-number: QTBUG-31397
Change-Id: Ie2a7e6cbfbb27bf1baff779322670d85e92e10dd
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-04-16 12:26:43 +02:00
Richard Moe Gustavsen
839c54e070 iOS: fix crash in auto correction when using unknown font family
If QFont reports a family name that cannot be used to instanciate
a UIFont, we end up trying to insert a nil object to an
NSDictionary. This will raise an exception.

This patch will check that we have a valid UIFont before using it.

Task-number: QTBUG-38018
Change-Id: Id8a2e4afea8c915ff43a7e4680304ba19328f9c2
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
2014-04-16 12:26:43 +02:00
Jorgen Lind
50b8506eac XCB: fix that modal dialogs can go behind other process windows
Task-number: QTBUG-35302
Change-Id: I1ad7a66e530710d5338a15057254360dae676451
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
2014-04-16 09:30:32 +02:00
Paul Olav Tvete
3f9ad1efd6 Android: Reset input method when focus changes
Qt Quick does not have the widgets workaround of explicitly hiding
the input method on focus out. This fix copies what happens in
the iOS port: Commit the current preedit and reset the IM when we
see that the focus object changes.

Task-number: QTBUG-38047
Change-Id: I30805265286dc650b3734e2a24807cdc8bfbcd16
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-04-16 07:29:22 +02:00
Konstantin Ritt
fec19027a5 Fix font merging for complex scripts on Windows
As long as QWindowsFontDatabase::fallbacksForFamily() does not take script
parameter into account, we should prefer QFontEngineMultiQPA's loadEngine()
implementation for complex scripts; otherwise we could fall into a situation
where reported fallback fonts doesn't support the requested script at all.

This finishes c3b2425791.

Task-number: QTBUG-37836
Change-Id: I2c43d97f1331ad05116856f9fe77560ed4dd02c7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-04-16 07:29:03 +02:00
Oswald Buddenhagen
c99f909bed don't make relative paths if we don't know the top-level build dir
regression from qt4.

Task-number: QTBUG-37113
Change-Id: I34813f03d8ec686e3ecb49f66629079489a3d83d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-04-16 07:28:52 +02:00
Jerome Pasion
a08b5201c1 Doc: Adding Enginio's export macro to the list of excluded QDoc tokens.
-helps the QDoc parser read C++ API when the macro is excluded.

Task-number: QTBUG-33360
Change-Id: Ic7e86c0d1cec4a1960d20b1c92c4b60396eb3ea6
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-04-16 07:28:39 +02:00
Oswald Buddenhagen
ffc0e68a16 fix debug_and_release builds
Task-number: QTBUG-38358
Change-Id: Idb02fd845c1f36b963150cc150dd2ee5bdd7bc4a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-04-16 07:28:33 +02:00
Leena Miettinen
454ebcac45 Doc: recommend using QLocale for loading translations
Users can choose to use different UI languages and regional settings on
their devices. QTranslator::load(const QLocale &) function uses
QLocale::uiLanguages() and not to the locale name, which refers to the
formatting of dates and numbers.

Change-Id: Iec6327dd1e91d913176499b23482d725b9d0a8aa
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-04-16 07:28:00 +02:00
Friedemann Kleint
3536823c7f QCollator: Add note about ICU dependency.
Task-number: QTBUG-28766
Change-Id: If661915457c4874a72e1111b85897aea596362bf
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
2014-04-16 06:28:43 +02:00
Wolfgang Bremer
a75153f8d0 Fix objcopy config test for concurrent make processes
The make targets had no dependency to the built binary. Therefore
when building with multiple make processes(-j8) it was not guaranteed
that the binary was available for the objcopy tests.

Change-Id: Ifd04e3f49fdadf030e82e81498668899ad4e7fd3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-04-15 17:53:29 +02:00