profile/ivi/qtbase.git
12 years agoCorrectly export GL graphics engine for use in plugins
Donald Carr [Fri, 16 Mar 2012 00:02:46 +0000 (00:02 +0000)]
Correctly export GL graphics engine for use in plugins

EGLFS and QNX both reference this symbol, hence it needs to be exported

Change-Id: I11b2b8ad5f2b81d951173f7cd8a7fbb8be4bb89b
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMake comment() work in the C locale too.
David Faure [Wed, 21 Mar 2012 09:03:26 +0000 (10:03 +0100)]
Make comment() work in the C locale too.

The parser makes the default language en_US, and no mimetype xml says
<comment xml:lang="C">, so use the en_US string for the C locale,
rather than returning an empty string.

Change-Id: Iad7c142e8078abe357773249416e7ce9b3e29a92
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoReturn all expected paths in QStandardPaths::standardLocations
David Faure [Thu, 15 Mar 2012 11:05:58 +0000 (12:05 +0100)]
Return all expected paths in QStandardPaths::standardLocations

ApplicationsLocation and DataLocation were returning only the local path,
rather than system paths + local path.

Change-Id: I653d14e5bbe1e08c5fa1ecd5a6106336d1cd0369
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoDon't do anything if setting the same proxy factory.
Xizhi Zhu [Thu, 22 Mar 2012 10:25:51 +0000 (11:25 +0100)]
Don't do anything if setting the same proxy factory.

Otherwise, it crashes if you simply set the same proxy factory instance
twice.

Change-Id: I4b1f1d0eed7630c9a145c0a330c6be1b3fc381e5
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
12 years agoCocoa: fix setting color with alpha channel value for color dialog
Teemu Katajisto [Thu, 22 Mar 2012 11:27:21 +0000 (13:27 +0200)]
Cocoa: fix setting color with alpha channel value for color dialog

Make sure that if ShowAlphaChannel option is set then also setShowsAlpha
needs to be set for the panel before setting the current color, otherwise
alpha channel value is omitted.

Task-number: QTBUG-24320

Change-Id: Ifb3822711af8ffd0cf6cb4c8aab2b0020d296663
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoUpdate QtXmlPatterns module name in documentation
Honglei Zhang [Wed, 21 Mar 2012 11:35:00 +0000 (13:35 +0200)]
Update QtXmlPatterns module name in documentation

According to new module name convention, QtXmlPatterns is
replaced with Qt XML Patterns in all documentation.

Task-number: QTBUG-24775

Change-Id: I9ca85728e266bd1ca9fa7a14e5e68c43c8d3e826
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoNeed to check new rotation against initial rotation instead of current
Kevin Krammer [Wed, 21 Mar 2012 12:01:55 +0000 (13:01 +0100)]
Need to check new rotation against initial rotation instead of current

Only swap width/height of initial geometry if orthogonal to initial
rotation not orthogonal to current rotation

Change-Id: I825954e98dee6c0d07a284307dfb8e1f9fd538e6
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
12 years agoShow correct origin of Q_ASSERT in Windows dialog
Kai Koehne [Wed, 21 Mar 2012 09:15:01 +0000 (10:15 +0100)]
Show correct origin of Q_ASSERT in Windows dialog

Display the actual file and line where the Q_ASSERT statement
was triggered.

Change-Id: I54d72f4c4bd9edee744c0f6e08f31b8e3120f454
Reviewed-by: David Faure <faure@kde.org>
12 years agoRemove redundant \since 5.0
Debao Zhang [Thu, 22 Mar 2012 04:57:26 +0000 (21:57 -0700)]
Remove redundant \since 5.0

\since 5.0 has been add to the class section, so member functions and
properties donot need this any more.

see SHA: 5728c8a8e7c994b931d340315c241350d646f62a

Change-Id: I4e67461373dda99ee1fbfdeb6477fde1dcfec116
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoFixed path in qobject unittest
Kurt Korbatits [Thu, 22 Mar 2012 03:07:29 +0000 (13:07 +1000)]
Fixed path in qobject unittest

- Fixed path was failing to find sub program.

Change-Id: I86f1a6941e244c9bc25ad0441cc7a441607560b7
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoChanged installTestHelperApp() to use relative paths to build
Kurt Korbatits [Thu, 22 Mar 2012 02:46:19 +0000 (12:46 +1000)]
Changed installTestHelperApp() to use relative paths to build

- Changed installTestHelperApp() to use OUT_PWD path to find files.
  (was looking in source tree instead of build)

Change-Id: If795c17a76aebcfbbe0d4f84c5df784a255ddb19
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUse delete[] instead of delete.
Sergio Martins [Thu, 15 Mar 2012 11:10:39 +0000 (11:10 +0000)]
Use delete[] instead of delete.

Change-Id: Idfa039a56ce0f7af92e91ec1657d91c79c400d6c
Reviewed-by: David Faure <faure@kde.org>
12 years agoAdded extra tests to json benchmark
Kurt Korbatits [Mon, 19 Mar 2012 04:54:16 +0000 (14:54 +1000)]
Added extra tests to json benchmark

- Added toByteArray() and fromByteArray() benchmark tests.
  Performance tests to measure QVariantMap to bytearray
  and bytearray to QVariantMap.
  Use case: Interprocess communications via local socket

Change-Id: If5e94ff870890b2ebb665f3cc38f5c33b34547f4
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoQDoc: updating manual to use "type".
Jerome Pasion [Wed, 21 Mar 2012 11:22:19 +0000 (12:22 +0100)]
QDoc: updating manual to use "type".

-updated both QDoc manual and QDoc guide
-"QML element" and "QML component" should be "QML type"

Change-Id: Ib2a0e8baa9087a04d35c05bbbd35852da10faf42
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Disable generation of .pageindex file.
Casper van Donderen [Wed, 21 Mar 2012 12:28:25 +0000 (13:28 +0100)]
qdoc: Disable generation of .pageindex file.

The .pageindex file was generated for the search engine on the
doc.qt.nokia.com website, since this website is not used anymore there
is no use for the .pageindex file.

Task-number: QTBUG-24911
Change-Id: Ie74f569ce881ab383d83ac9c5a8bc223da91564a
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoUse main thread event loop for navigator event processing
Kevin Krammer [Tue, 20 Mar 2012 10:27:52 +0000 (11:27 +0100)]
Use main thread event loop for navigator event processing

Removes the need for an extra thread by creating the event handler's
socket notifier in the context of the main thread.

Change-Id: If8c7bb986074083b5b9a7b9c96734a970ba32f92
Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoRemove Q_WS_X11
Frederik Gladhorn [Thu, 15 Mar 2012 14:16:43 +0000 (15:16 +0100)]
Remove Q_WS_X11

The define is removed and only adds includes.

Change-Id: Id6cc32aa22536f78bb5de10cb779a3168e79441a
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoFix QWidgetTextController issue when used with QtQuick1 TextEdit
Pekka Vuorela [Tue, 20 Mar 2012 16:52:50 +0000 (18:52 +0200)]
Fix QWidgetTextController issue when used with QtQuick1 TextEdit

Calling QInputMethod::invokeAction() was not checking for proper event
type and was requiring context widget unnecessarily.
Fixes some parts of QTBUG-24035

Change-Id: I51fe9ed02a018ced36319eb672a088503649b275
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoFix directories never being unwatched after deletion on Windows.
Robin Burchell [Sat, 17 Mar 2012 22:28:48 +0000 (23:28 +0100)]
Fix directories never being unwatched after deletion on Windows.

This causes all sorts of problems, but is also blocking the introduction of new,
more detailed signals, because the backend never correctly identified the removal.

The object handle appears to be woken up before the directory is actually
deleted, thus causing QFileInfo::exists() to return true, and not doing the
removal dance. This behaviour isn't exactly documented (as far as I was able to
find out), but also seems to happen consistently, and Chromium also contains
a comment noting a similar issue.

Task-number: QTBUG-2331
Change-Id: Icfb6219b78e688852d7863a666a0ffc31bb4d573
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoCocoa: improve mouse button tracking warnings
Bradley T. Hughes [Wed, 21 Mar 2012 10:08:14 +0000 (11:08 +0100)]
Cocoa: improve mouse button tracking warnings

The warnings about "Internal mouse button tracking invalid" should check
for the correct button before emitting a warning. The warning should
also mention the correct button as well. For otherMouseDragged, we
simply check for any button that's not the left or right button.

Change-Id: I9eb6d6bd7fb5919e745b7f8eb517b4bc9efd36a6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCocoa: Improve window activation handling.
Morten Johan Sorvig [Wed, 21 Mar 2012 07:47:16 +0000 (08:47 +0100)]
Cocoa: Improve window activation handling.

Make Qt window activation follow the Cocoa key
window, with one exception: Popup windows become
the key window but not the Qt active window.

Change-Id: Ic4d8685737fa3ec5c15a68b81844929370c9cd8e
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoQDoc: Changing "element" string to "type".
Jerome Pasion [Wed, 21 Mar 2012 09:30:01 +0000 (10:30 +0100)]
QDoc: Changing "element" string to "type".

-QDoc output should use "type", not "element".
"This type was introduced..."

Change-Id: I72b6ba6318889d7727796b80574b72694f2b7594
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agopermit explicitly empty qt.conf entries
Oswald Buddenhagen [Tue, 20 Mar 2012 18:18:51 +0000 (19:18 +0100)]
permit explicitly empty qt.conf entries

this allows expressing "no SettingsPath" cleanly, and makes the
internals cleaner.

this is marginally behavior-incompatible in that if somebody had Prefix
or Data set to an empty string (rather than a dot, which is hinted at by
the documentation and commanded by common sense), he would have gotten
the binary's directory resp. Prefix, while now it will be just empty.

Change-Id: I3c11cc4e8671ffb604d4889389764a9ba9c2e7e6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoRemove hardcoded font names in QFont::defaultFamily()
Jiang Jiang [Tue, 20 Mar 2012 10:57:35 +0000 (11:57 +0100)]
Remove hardcoded font names in QFont::defaultFamily()

QFont::defaultFamily() should not use any hardcoded font names like
"Helvetica" or "Times" as they might not be present in certain systems,
it should rather use abstract names like "sans-serif", "serif" and
"monospace" then let the platform plugin to decide which font map to
them.

Change-Id: I5aafb103a5238c17b10773711ad504806c6fc3ce
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoCocoa: Implement screen availableGeometry.
Morten Johan Sorvig [Fri, 16 Mar 2012 13:26:15 +0000 (14:26 +0100)]
Cocoa: Implement screen availableGeometry.

As usual the y coordinate needs to be inverted.

Change-Id: Iac9b48f9bdb475a3d5a76b930c2e138a625f1ef8
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoCocoa: fix inactive palette text color
Bradley T. Hughes [Tue, 20 Mar 2012 09:53:45 +0000 (10:53 +0100)]
Cocoa: fix inactive palette text color

The QPalette::Inactive text color should be the same as
kThemeTextColorDialogActive. kThemeTextColorDialogInactive is for
disabled widgets/windows.

Change-Id: I55eb63fff213cb9870a991455cbc3254b9d1538e
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoCocoa: fix crash when using QPrintDialog
Bradley T. Hughes [Tue, 20 Mar 2012 08:18:30 +0000 (09:18 +0100)]
Cocoa: fix crash when using QPrintDialog

The contextInfo passed to printPanelDidEnd should be a QPrintDialog*,
not a QPrintDialogPrivate*.

Change-Id: I8f9aae2f27b483b4669f9d39cdafd0ddeb37fd22
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoEGLFS: Integrate building into configure.
Donald Carr [Wed, 7 Mar 2012 14:07:07 +0000 (14:07 +0000)]
EGLFS: Integrate building into configure.

With the move to the QPA architecture EGL is now only required by
individual platform plugins and the configure script has been adjusted to
reflect this.

Change-Id: Ieadacef0b970f29752d9e3e36a007e5cbb005b0d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoAvoid Qt/X11 header contamination via egl.h
Donald Carr [Mon, 19 Mar 2012 13:45:42 +0000 (13:45 +0000)]
Avoid Qt/X11 header contamination via egl.h

egl.h on certain platforms directly includes X11 headers, resulting in an
all too familiar header conflict. There are existing defines we merely need
to set in order to avoid this eventuality.

Change-Id: Ic91b66286ad6cc329f9c88b5e47834690a8eb96a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoAdd egl include paths and link lines to eglfs.
Girish Ramakrishnan [Sat, 17 Mar 2012 00:07:42 +0000 (17:07 -0700)]
Add egl include paths and link lines to eglfs.

This is the equivalent of 821fc4cf4e520a74b8d4c834f2fb46e4e2f27001
from qt4 but done differently because qt5 has egl.prf.

Change-Id: I52114239bdeda6c300db04a7859cae52aa9e9b41
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFix a typo in QFontconfigDatabase
Jiang Jiang [Tue, 20 Mar 2012 08:56:00 +0000 (09:56 +0100)]
Fix a typo in QFontconfigDatabase

Font family names for default families (Serif, Sans serif, Monospace)
was only taken from the first family in the array (aka. always Serif).

Change-Id: Ia326dc85e03819f1a72deda66aade348809d94da
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoFix GPOS positioning for some fonts
Eskil Abrahamsen Blomfeldt [Tue, 20 Mar 2012 11:01:22 +0000 (12:01 +0100)]
Fix GPOS positioning for some fonts

We need to do ACCESS_Frame for each 2 byte frame, otherwise
the position of the cursor in the input stream will not be
updated by enough, and we will read twice as many pairsets.
Depending on the value read for the SecondGlyph in the
broken pairsets, we might get strange kerning results.

Change-Id: I7fb5a850afe0364b3dd50869d5f36fd14d2f4eaf
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com>
12 years agoSet the default QPA plugin for QNX builds to "qnx"
Sean Harmer [Tue, 20 Mar 2012 14:07:39 +0000 (14:07 +0000)]
Set the default QPA plugin for QNX builds to "qnx"

Change-Id: I630c3631d480929c1e3a618d0f0b084fd2cc6ad0
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix stltest compilation
Giuseppe D'Angelo [Fri, 16 Mar 2012 21:48:31 +0000 (21:48 +0000)]
Fix stltest compilation

The usage of std:ptrdiff_t in the test requires the #inclusion of
the cstddef header.

Task-number: QTBUG-24828
Change-Id: I7e1ca6ee010469708f8da1709563b5ebced972e5
Reviewed-by: Anssi Eteläniemi
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove old bic test data
Marius Storm-Olsen [Tue, 20 Mar 2012 14:16:15 +0000 (15:16 +0100)]
Remove old bic test data

We will not be testing BIC of Qt5 against Qt4

Change-Id: I6f0eea3dd60eea1535749240a178a19605c981d0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRevert "Remove the LIBS from platformsupport"
Samuel Rødal [Tue, 20 Mar 2012 08:17:18 +0000 (09:17 +0100)]
Revert "Remove the LIBS from platformsupport"

This reverts commit cd6e90c70ac13065257422088ffa01537ed9c685.

Prevent symbol lookup error when requesting alpha visuals with GLX in
the xcb plugin. This means other plugins will also link against
-lXrender, but we need this workaround for now.

Change-Id: I2fd2c63bc577c2497060a555c91d72337723b931
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoqdoc: Handle multiple \ingroup commands in QML types.
Martin Smith [Tue, 20 Mar 2012 13:08:25 +0000 (14:08 +0100)]
qdoc: Handle multiple \ingroup commands in QML types.

These were not handled in the QmlVisitor class.
It was believed they would appear as separate
commands in QmlVisitor, but the appear as one
\ingroup command followed by several group
identifiers.

Change-Id: If198433f7cd5095264f41346987c49ee4c30a786
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Remove short description from apiDesc
Martin Smith [Mon, 19 Mar 2012 11:20:20 +0000 (12:20 +0100)]
qdoc: Remove short description from apiDesc

The XSLT already adds this from the <shortdesc>.

Change-Id: I5813bf668f9b198e6b76bc0af8f26c7a910890fb
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Remove the spectitle attribute
Martin Smith [Mon, 19 Mar 2012 09:54:15 +0000 (10:54 +0100)]
qdoc: Remove the spectitle attribute

qdoc no longer writes the title as the value of the
spectitle attribute in the <apiDesc> element.

Change-Id: I3f89142fa764c9ac2f3f3bcf9d9162bcf3528df2
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Enable XSLTs to produce correct #include info.
Martin Smith [Mon, 19 Mar 2012 09:31:27 +0000 (10:31 +0100)]
qdoc: Enable XSLTs to produce correct #include info.

qdoc no longer writes the expected "include" statment
in a codeblock in the detailed description. It writes
it as an <othermeta> element in the <prolog> instead.

Change-Id: I303477dbba7f2383fb374a398c890760a15744de
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Rename qt3 support pages to Compatibility pages.
Casper van Donderen [Mon, 19 Mar 2012 12:26:55 +0000 (13:26 +0100)]
qdoc: Rename qt3 support pages to Compatibility pages.

Task-number: QTBUG-24849

Change-Id: I9453e38372f909d75bb4fb8642dc9bd7b993aa7e
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoNotifier signals don't need separate documentation.
Casper van Donderen [Mon, 19 Mar 2012 17:52:56 +0000 (18:52 +0100)]
Notifier signals don't need separate documentation.

Similar to getters and setters, notifier signals don't need separate
documentation.

Reimplementation of http://codereview.qt-project.org/#change,19374 in
qtbase.

Change-Id: If77fc554a3d8c1b520940d23e17cb7f76a71660f
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoCocoa: Panels can become key windows too.
Morten Johan Sorvig [Tue, 20 Mar 2012 07:32:55 +0000 (08:32 +0100)]
Cocoa: Panels can become key windows too.

The cocoa plugin uses NSPanel instead of NSWindow
for popup-type windows. With the exception of tooltips
and splash screens these windows should take input
focus as well.

Change-Id: Icdf0854e7c511ccc106e035dae4763ae90c23aa5
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoQHeaderView - minor fix to setDefaultSectionSize
Thorbjørn Lund Martsum [Sat, 10 Mar 2012 15:47:02 +0000 (16:47 +0100)]
QHeaderView - minor fix to setDefaultSectionSize

This fixes a situation where we (wrongly) assume that
a section with size 0 is hidden. However a hidden
section should be one that we have called hideSection
(or setSectionHidden) on.

Change-Id: Ic14eded2666022f27434dc55927323a74910549c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQHeaderView - minor fix to createSectionSpan
Thorbjørn Lund Martsum [Thu, 15 Mar 2012 15:38:59 +0000 (16:38 +0100)]
QHeaderView - minor fix to createSectionSpan

I am unsure if this is only theoretic - but if/when we have added
sections here - we must ensure that we recalculate startpositions.

Change-Id: I70bf55209f1a1a885cb49748b65218879bc68776
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoHarfbuzz-shaper - fix incorrect logClusters being set in HB_OpenTypePosition
John Tapsell [Fri, 9 Mar 2012 23:08:49 +0000 (23:08 +0000)]
Harfbuzz-shaper - fix incorrect logClusters being set in HB_OpenTypePosition

After shaping in HB_OpenTypePosition, when we come to calculate the new
logClusters array we have to take into account that the glyphs passed in
are not a 1 to 1 correspondance with the original string, because some
shaping might have already been done.  So we must use the old
logClusters values (stored in tmpLogClusters) to map from the glyphs
passed in back to the original string.

This fixes visual word wrapping problems in thai

Change-Id: I384dfa98f0946e9e074728f89542acb2b6b6bc27
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoRemove QT += uilib from designer.prf
Bradley T. Hughes [Tue, 20 Mar 2012 07:31:43 +0000 (08:31 +0100)]
Remove QT += uilib from designer.prf

No Qt module named uilib exists.

Change-Id: Icb5916c27440257696e5103f0d61dc05e4d7bb9f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix QT_NO_DEBUG_STREAM build
Richard Moore [Mon, 19 Mar 2012 21:11:47 +0000 (21:11 +0000)]
Fix QT_NO_DEBUG_STREAM build

Change-Id: I640f93750583d36284f189fa12bac6440664a7a2
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoFix raster autotest: consistently assume scripts in UTF8, not latin1
aavit [Mon, 19 Mar 2012 12:46:47 +0000 (13:46 +0100)]
Fix raster autotest: consistently assume scripts in UTF8, not latin1

The Lancelot raster painting autotest assumed latin1 encoding of the
QPS scripts files, while the script engine would import subscripts
as UTF8. This fix standardizes on UTF8.

Change-Id: I9e7c1ee7b6ffe77ff68edc8423f00dfb9ab3e95b
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoCocoa: set font engine glyph format based on display type
Bradley T. Hughes [Mon, 19 Mar 2012 12:51:53 +0000 (13:51 +0100)]
Cocoa: set font engine glyph format based on display type

Make the QCoreTextFontEngine::glyphFormat depend on the primary
display's subpixel layout (if any). This change also refactors the
antialiasing threshold setting to live beside the defaultGlyphFormat.

Change-Id: I27f94f775d91d2a68cd647cc24503b31b6ff5e61
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix KDE palette.
Olivier Goffart [Sat, 17 Mar 2012 18:46:33 +0000 (19:46 +0100)]
Fix KDE palette.

In QKdeTheme We want to load every color.
Else, only the first color is loaded, and the rest of the palette is
just black making the applications basicaly not usable.

But KDE only put in its config files the colors that are different from
the default colors.  This is the reason why we need to resolve against
the style's default palette.

We need to make sure the resolve_mask is 0 for an empty palette, even
before the application palette is set. This was not required in Qt4
because the system palette was initialized differently.

I realize this will only work with QApplication (and not with a single
QGuiApplication) but it was not working before either.

Change-Id: Ifb3c2c1358ef6d83a1ca5aa8fac3d2d4ea712b94
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoCocoa: Implement support for child windows.
Morten Johan Sorvig [Tue, 13 Mar 2012 09:37:53 +0000 (10:37 +0100)]
Cocoa: Implement support for child windows.

On OS X, child windows (in the Qt sense) are not
windows. Add special case to window creation that
links the content views instead of creating a
NSWindow. Add a similar special case to
setGeometry().

Refactor window (re)creation into recreateWindow(),
which is called from both the QCocoaWindow
constructor and setParent().

m_nsWindow may now be null, add null-pointer checks
to all usages. Change winId() to return the
m_contentView pointer instead of m_nsWindow.

QGLWidget now works, but probably has sibling window
stacking issues which we won't be able to fix without
moving to client-side compositing.

Change-Id: I2e74cf27734dba7076c150e0d8341f0a62d3de2d
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoqdoc: Merge PageGenerator into Generator class.
Casper van Donderen [Sat, 17 Mar 2012 18:44:49 +0000 (19:44 +0100)]
qdoc: Merge PageGenerator into Generator class.

This change also sorts all functions in Generator by alphabet and moves
the implementation of the GenerateQmlInheritedBy function to the
Generator class, since the implementation in both the DITA and HTML
generators was the same.

Task-number: QTBUG-24833
Change-Id: I44588079159e03b7ff7549e5478babb1aabdaf1b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoRemove QAccessibleEvent child parameter.
Frederik Gladhorn [Mon, 12 Mar 2012 18:43:03 +0000 (19:43 +0100)]
Remove QAccessibleEvent child parameter.

This makes the api cleaner and generally the child should not be there.
It is only sometimes more convenient not to create a QAccessibleInterface
instance, so the functionallity is kept.

Change-Id: I26018a6d3e0549f4d79856775b4167c5660e229d
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoAdd IDENTITYPROXYMODEL feature
sh kim [Thu, 15 Mar 2012 02:11:51 +0000 (11:11 +0900)]
Add IDENTITYPROXYMODEL feature

Change-Id: Ic92165b2ab06e5b5f733bfaf2f7fe908861c0efa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoInclude generic ARM qplatformdefs.h in linux-g++-maemo mkspec
Gareth Stockwell [Mon, 12 Mar 2012 12:57:37 +0000 (12:57 +0000)]
Include generic ARM qplatformdefs.h in linux-g++-maemo mkspec

qmake.conf already includes the linux-arm-gnueabi-g++ configuration;
this patch does the same for the platformdefs.h header.

Change-Id: I14ee4e406e8c00ae1a57140676f60d030daba18f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoDisable some tests and examples when --no-widgets is specified
Jędrzej Nowacki [Fri, 16 Mar 2012 11:53:35 +0000 (12:53 +0100)]
Disable some tests and examples when --no-widgets is specified

There are many tests, examples that depends on widgets. This patch
disables some of them if Qt is configured without widgets.

Change-Id: I5460dadca736c54221874adcd518a7021725d90a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoImproves configure checks for XCB.
Bradley Smith [Mon, 19 Mar 2012 01:44:31 +0000 (18:44 -0700)]
Improves configure checks for XCB.

The XCB plugin requries libxcb >= 1.5. Configure and
config.tests/qpa/xcb now check for this.

Change-Id: I96c688b79bf5b49fd3ecc4ddc12ebdc2d3788790
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAccessibility: add text update events
Frederik Gladhorn [Mon, 30 Jan 2012 17:52:46 +0000 (18:52 +0100)]
Accessibility: add text update events

Change-Id: Iece9d100b3f5a379d7d8e29dea67a10d0c918c06
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoQtWidgets: cleanup several Q3* items
Debao Zhang [Sun, 18 Mar 2012 05:59:10 +0000 (22:59 -0700)]
QtWidgets: cleanup several Q3* items

Change-Id: I0812cdd74f19b4c98336724ea722807d4c68cf7d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix infinite recursion crash in QPrinterInfo::supportedPaperSizes()
Miikka Heikkinen [Mon, 19 Mar 2012 13:31:17 +0000 (15:31 +0200)]
Fix infinite recursion crash in QPrinterInfo::supportedPaperSizes()

This function calls platform specific function
QWindowsPrinterSupport::supportedPaperSizes(), which then called back
to QPrinterInfo::supportedPaperSizes(), causing infinite recursion.

Fixed by providing a proper implementation for querying supported
paper sizes in QWin32PrintEngine - the same implementation was used in
Qt 4.8.

Task-number: QTBUG-24190
Change-Id: I64a2773d83596df19818bf2636f1255943d7851d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoSilence warnings about va_list mangling for QNX toolchain
Sean Harmer [Mon, 19 Mar 2012 11:40:01 +0000 (11:40 +0000)]
Silence warnings about va_list mangling for QNX toolchain

Change-Id: I12d8d534c3c5d93e95a03d7b3705f3722501de7d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
12 years agoQWidget: update documents of mouseDoubleClickEvent()
Debao Zhang [Sat, 17 Mar 2012 00:02:49 +0000 (17:02 -0700)]
QWidget: update documents of mouseDoubleClickEvent()

Double click behavior has been changed.
see SHA: b371f3f943703840d0dfbe30505018bcca06e260

Change-Id: Ibd921d01fb25b8c31f75105a4ff63c42bf00c335
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
12 years agoFix a memory leak in template QMetaObject::Connection.
Jędrzej Nowacki [Wed, 14 Mar 2012 08:46:02 +0000 (09:46 +0100)]
Fix a memory leak in template QMetaObject::Connection.

QObject::QSlotObjectBase instance given as argument to
QObject::connectImpl was not dereferenced in case of an unsuccessful
connection.

Change-Id: I206b14e986690c027aafc2593762d85dc619e0e6
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoCocoa: Send keyboard modifiers with wheel events.
Morten Johan Sorvig [Fri, 16 Mar 2012 15:19:13 +0000 (16:19 +0100)]
Cocoa: Send keyboard modifiers with wheel events.

Read and save the modifiers at the beginning of the
event stream to keep the event interpretation constant
for the entire event stream.

Change-Id: I66046dea8f8fd3ff2f88c48da5f076377bda32dd
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix the compat handleWheelEvent function.
Morten Johan Sorvig [Fri, 2 Mar 2012 11:04:02 +0000 (12:04 +0100)]
Fix the compat handleWheelEvent function.

Only set the angleDelta QPoint when the platform
sends a delta/orientation pair.

Change-Id: I0440dca8b290bce10830c04ba42c5c955cd8e001
Reviewed-by: Luis Gabriel Lima <luis.gabriel@openbossa.org>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoSet RPATH_FLAGS on Mac too
Lincoln Ramsay [Mon, 19 Mar 2012 03:32:31 +0000 (13:32 +1000)]
Set RPATH_FLAGS on Mac too

Without this, QMAKE_RPATHDIR is empty and qt_module.prf's logic to turn
on absolute_library_soname fails, causing some modules to build without
absolute paths (eg. qtjsbackend's QtV8 framework).

Change-Id: If03136ca60a5d8a96a589e2d1034e5884fd6a1ac
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoFixed benchmarks to work from install directory
Kurt Korbatits [Mon, 12 Mar 2012 04:24:02 +0000 (14:24 +1000)]
Fixed benchmarks to work from install directory

- Changed benchmarks to use TESTDATA and QFINDTESTDATA
- Fixed up targets all use tst_bench_ syntax

Change-Id: I5c2936702e248478f5df225ce38893158ee22d7f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMake copy and assign private for QAccessibleEvent.
Frederik Gladhorn [Mon, 12 Mar 2012 14:36:31 +0000 (15:36 +0100)]
Make copy and assign private for QAccessibleEvent.

Also make the handling of events in the test pointer
based since mac-g++ doesn't seem to like const
references the way they were before.

Change-Id: I7fe39978d4729b8e586be30978b74aa51ca7cfe6
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoconfigure: Fix iconv detection
Girish Ramakrishnan [Sat, 17 Mar 2012 17:49:36 +0000 (10:49 -0700)]
configure: Fix iconv detection

Makes no sense to disable iconv based on QPA. This change will
make iconv as the "system" codec i.e the codec used for 8-bit
locale dependent conversions.

Change-Id: I4469e9c226b2411ac1338f61dabb84ec9c2ec603
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoCocoa: Fix function key handling
Bradley T. Hughes [Fri, 16 Mar 2012 11:32:37 +0000 (12:32 +0100)]
Cocoa: Fix function key handling

Cocoa sends function keys (e.g. arrow keys, backspace, F1-F35, etc.) as
Unicode characters in the U+F700-U+F8FF range. Do not deliver text for
events that contain a single control character (to match Qt 4 behavior).
With this fix, keyboard navigation works again in Qt Creator when
running against Qt 5.

Change-Id: I5854bf713c2855dbc5ee491bace2f9dc1acd9426
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix shortcut handling in the Cocoa plugin
Bradley T. Hughes [Wed, 14 Mar 2012 14:06:39 +0000 (15:06 +0100)]
Fix shortcut handling in the Cocoa plugin

KeyPress events could be shortcuts or deadkeys, but we don't know which
until we try. Shortcuts take precedence over deadkeys, so send them
through QWindowSystemInterface::tryHandleSynchronousShortcutEvent()
before passing it onto the input method.

Change-Id: I479a3a7ff1c35e7c5692e8a17fb2173576dd0a29
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoWin32: Compile qmake when shadow-building
Marius Storm-Olsen [Fri, 16 Mar 2012 17:59:09 +0000 (12:59 -0500)]
Win32: Compile qmake when shadow-building

Change-Id: I803c733f744372701c51e4d629ff797c6648f833
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAdd new test cases to tst_QMetaType.
Jędrzej Nowacki [Thu, 8 Mar 2012 14:49:55 +0000 (15:49 +0100)]
Add new test cases to tst_QMetaType.

Change-Id: I405ab5df9d9de3a0a0a71276b172a27ee01392e3
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQPointer: update its document and changes-5.0.0
Debao Zhang [Fri, 16 Mar 2012 23:05:09 +0000 (16:05 -0700)]
QPointer: update its document and changes-5.0.0

QPointer has been un-deprecated and one behavior which slightly different
from Qt4 has been fixed.
see SHA: b8773165d76e0d5d46287d92f9d6bdbbd2110180
and SHA: 497622cafe235eadb5dd5056b196d8451ee89071

Change-Id: I4bae2cce3ebfebd8f59b18b5a6a7a7226b8353b9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoAdd QWindowSystemInterface::tryHandleSynchronousShortcutEvent()
Bradley T. Hughes [Thu, 15 Mar 2012 11:01:07 +0000 (12:01 +0100)]
Add QWindowSystemInterface::tryHandleSynchronousShortcutEvent()

This function sends a shortcut override through the shortcut system and
returns the result of the event. This will be used in platform plugins
(such as the Cocoa plugin) to make sure that shortcuts work when the
user presses a dead-key combination that normally would go through an
input method to produce text.

An extended overload taking native scan code, virtual key, and modifiers
has also been added.

Change-Id: Ia3836229ab0c66d2fb6f310e72b6f4d6dfa9ead9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAdd support for ICU on Windows
Marius Storm-Olsen [Thu, 8 Mar 2012 02:51:27 +0000 (20:51 -0600)]
Add support for ICU on Windows

Needed by QtWebKit now.

Change-Id: I177d8dcf6063a14501f7ba3081b43a29a48661c7
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDon't reject plugins that have empty meta-data
Lincoln Ramsay [Fri, 16 Mar 2012 02:08:51 +0000 (12:08 +1000)]
Don't reject plugins that have empty meta-data

Having an empty Json object ({}) should be valid meta-data but this
check means that there needs to be at least one key-value pair or
the plugin will be rejected.

Change-Id: I578ccc35016af16fd30b3807e796fa63c0282f30
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agocontainers: add C++11-style c{begin,end}() as alias for const{Begin,End}()
Marc Mutz [Mon, 29 Aug 2011 15:49:48 +0000 (17:49 +0200)]
containers: add C++11-style c{begin,end}() as alias for const{Begin,End}()

C++11 adds cbegin()/cend() functions for the same reason Qt has
constBegin()/constEnd(). This patch adds these functions to the
Qt containers with the same implementation as constBegin()/constEnd().

It also fixes the return types in the documentation of existing
constFind() functions (documentation only).

C++11 only adds cbegin()/cend() (and crbegin()/crend(), which Qt doesn't have).
In particular, it doesn't add cfind(), so I didn't supply these, even though
Qt comes with constFind().

This is a forward-port of https://qt.gitorious.org/qt/qt/merge_requests/1365.

Change-Id: Ida086b64246b24e25254eafbcb06c8e33388502b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoReplace Q_WS_MAC with Q_OS_MAC in qshortcut.cpp
Bradley T. Hughes [Wed, 14 Mar 2012 13:55:08 +0000 (14:55 +0100)]
Replace Q_WS_MAC with Q_OS_MAC in qshortcut.cpp

This re-enables shortcut context matching for menubar actions.

Change-Id: I0d9f2b3d4316a4611afe96eb1a2cf29cb9e91851
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoQCocoaClipboard: Make QClipboard::clear() clear.
Morten Johan Sorvig [Fri, 16 Mar 2012 12:05:37 +0000 (13:05 +0100)]
QCocoaClipboard: Make QClipboard::clear() clear.

Change-Id: Ifb235d015f7831b335a9c3db92515a8d1cd49311
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix bug showing folder icons for files
Arnt Witteveen [Wed, 14 Mar 2012 13:53:32 +0000 (14:53 +0100)]
Fix bug showing folder icons for files

Fix an issue where the cache was updated with the folder icon,
even though this is never used from the cache. This caused
files to sometimes be shown with a folder icon: If a folder
has an extension (e.g. a folder named 'folder.ext'), this
means the folder icon will be written to the cache for the
'ext' extension, and from that point on all .ext files will
be shown with the folder icon.

The fix is to not save an icon in the cache for those cases
where it will not be used from the cache anyway, by using the
same condition for updating the cache as for reading it (which
is in line 8 of the same function).

Change-Id: I9ce8fca0718b2b62b9390fa64989acd54952a88e
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoqdoc: Structure the DITA map with a root node.
Martin Smith [Fri, 16 Mar 2012 08:50:39 +0000 (09:50 +0100)]
qdoc: Structure the DITA map with a root node.

Use the title from the index.html page for the
navtitle, if there is a title on the index.html
page. Otherwise use the project as the navtitle.

Task-number:  Mzilla bug - 7229
Change-Id: I25fc1f09b0bdff58c6340cec7d9d8a43d95845a2
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoUpdated changes-5.0.0 with some information on the new QtGui classes.
Samuel Rødal [Fri, 16 Mar 2012 08:01:50 +0000 (09:01 +0100)]
Updated changes-5.0.0 with some information on the new QtGui classes.

Change-Id: Idcdfdb506e75d74b3a89e6c2e914802ddfc11031
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoEnsure QMAKE_RFLAGSDIR is set correctly
Gareth Stockwell [Fri, 16 Mar 2012 14:14:53 +0000 (14:14 +0000)]
Ensure QMAKE_RFLAGSDIR is set correctly

This patch ensures that additional runpaths passed to configure via
the -R switch are added to the QMAKE_RFLAGSDIR variable.

Previously, although runpaths provided in this way were appended to the
linker options when building Qt itself, they were not appended to
the QMAKE_RFLAGSDIR value written to mkspecs/qconfig.pri.  This meant
that the DT_RPATH attribute was set incorrectly in binaries built from
projects other than Qt itself.

-----------------------------------------------------------------------
Configure flags             Expected value        Value before this fix
-----------------------------------------------------------------------
<none>                      DEFAULT_RPATH         DEFAULT_RPATH
-no-rpath                   <empty>               <empty>
-R X                        DEFAULT_RPATH:X       DEFAULT_RPATH
-no-rpath -R X              X                     <empty>
-prefix Y                   Y/lib                 Y/lib
-prefix Y -no-rpath         <empty>               <empty>
-prefix Y -R X              Y/lib:X               Y/lib
-prefix Y -no-rpath -R X    X                     <empty>
-----------------------------------------------------------------------

DEFAULT_RPATH = /usr/local/Qt-${QT_VERSION}/lib

Change-Id: Iaf1809b528ebd249694cf41e004173e881ca48ad
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoInstall fonts when not using fontconfig
Girish Ramakrishnan [Fri, 16 Mar 2012 06:20:53 +0000 (23:20 -0700)]
Install fonts when not using fontconfig

When built without fontconfig support, the basic unix font database
relies on fonts installed in libs/fonts to populate the database.

Change-Id: Id1e54c5b032095470049210bb831cfe4c79b3569
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoallow the unix generator to run in windows host mode
Oswald Buddenhagen [Fri, 16 Mar 2012 11:17:26 +0000 (12:17 +0100)]
allow the unix generator to run in windows host mode

this is a complete bastardization of the concept and breaks the (unused)
debugging feature to create proper unix makefiles under windows, but
apparently it permits cross-compiling unix targets under windows.

Change-Id: I4ee95a20e7d6a6b2063ec7aa22f52c1a97d78a77
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoFix font cache check in QFontEngineFT::recalcAdvances()
Miikka Heikkinen [Fri, 16 Mar 2012 09:13:55 +0000 (11:13 +0200)]
Fix font cache check in QFontEngineFT::recalcAdvances()

Cached font was used regardless of the format, resulting in incorrect
advance in some cases when default format differed from the cached
format.

Task-number: QTBUG-24188
Change-Id: I39e4156bd9ba743afa7e106e934c90227fbf2b8b
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoRemoved move constructor.
Wolf-Michael Bolle [Thu, 15 Mar 2012 14:56:14 +0000 (15:56 +0100)]
Removed move constructor.

All C++-2011-specific constructors, operators and methods may be inline
only in Qt. Since an implementation in the header file does not seem to
be possible for QMimeType without breaking backward compatiblity the
move constructor has to disappear altogether.

See also the discussion at
http://codereview.qt-project.org/#change,19150

Change-Id: If07347a51a1ae5bd4c2d292dac835592ede4b370
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemoved move constructor.
Wolf-Michael Bolle [Thu, 15 Mar 2012 15:03:12 +0000 (16:03 +0100)]
Removed move constructor.

The provided implementation breaks backward compatiblity, and therefore
has to disappear altogether.

See also the discussion at
http://codereview.qt-project.org/#change,19150

Change-Id: Idf6e4a2c4b623458217541485e4aab0837909d66
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoCocoa: Fix menu item activation.
Morten Johan Sorvig [Fri, 16 Mar 2012 09:15:10 +0000 (10:15 +0100)]
Cocoa: Fix menu item activation.

Handle the action message on the application delegate.

Change-Id: I23686fd6e936a4dbbb141da3dd04a64cbf6a051a
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix broken qWaitForWindowShown() behavior
Charles Yin [Fri, 16 Mar 2012 05:09:18 +0000 (15:09 +1000)]
Fix broken qWaitForWindowShown() behavior

qWaitForWindowShown() should check window->isActive() instead of
window->isExposed() and return false if timeout.

Add two new qWaitForWindowActive() and qWaitForWindowExposed()
functions.
Change-Id: Idd9601805c2e84b0d36ddd5471031b627d289953
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoQRegularExpression: various documentation improvements/fixes
Giuseppe D'Angelo [Thu, 15 Mar 2012 12:52:49 +0000 (12:52 +0000)]
QRegularExpression: various documentation improvements/fixes

Change-Id: I683afb24f888ab6cf3c543fba8cd193a730709af
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoarch: Undefine possible architecture defines
Holger Hans Peter Freyther [Thu, 15 Mar 2012 16:42:07 +0000 (17:42 +0100)]
arch: Undefine possible architecture defines

Some compilers define the architecture to one leading to detecting
'1' as target architecture. Always undef the architecture name.

Compilers:
gcc version 4.6.3 (Debian 4.6.3-1) has '#define i386 1'
gcc version 4.5.3 (Broadcom stbgcc-4.5.3-1.3) has '#define mips 1'

Change-Id: I7af1bb743579be472467c74e6c08638648823ef3
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoAdd deliberately non-documented qpa platform guard opt out
Donald Carr [Fri, 9 Mar 2012 00:22:27 +0000 (00:22 +0000)]
Add deliberately non-documented qpa platform guard opt out

Change-Id: Ia494976d3cd3c3983d455f130fdf5ab36591aba2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoUn-deprecate QPointer per mailing list discussion.
Robin Burchell [Thu, 15 Mar 2012 19:11:04 +0000 (20:11 +0100)]
Un-deprecate QPointer per mailing list discussion.

Now that QPointer is implemented in an efficient manner, there is really no need
to avoid it, deprecating it just adds a large amount of churn.

Change-Id: I32116faf14c3b07631d59ba9585f9ce422531646
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoAdd a note to QTouchEvent docs about empty touchpoint lists
Laszlo Agocs [Thu, 15 Mar 2012 11:31:00 +0000 (13:31 +0200)]
Add a note to QTouchEvent docs about empty touchpoint lists

Change-Id: I65e9e3ed2069d9194f5e70fb9731d605e0979e6d
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRevert "Disable 'check' target generation for network autotests for Windows."
Shane Kearns [Fri, 2 Mar 2012 11:18:43 +0000 (11:18 +0000)]
Revert "Disable 'check' target generation for network autotests for Windows."

Too broad disabling, will disable more selectively

This reverts commit 3efb0d50e590f6a1e8d67d0136a648cd3b97c37d.

Change-Id: I29e25816646194b6a4b7d8ff69e0c0d074ac2a19
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix QDnsLookup autotest failure in CI environment
Shane Kearns [Mon, 12 Mar 2012 18:46:21 +0000 (18:46 +0000)]
Fix QDnsLookup autotest failure in CI environment

The DNS server can legitimately include NS and A records for
the authoritative name server in addition to the DNS records
that were requested.
These are now ignored when checking the reply (we only check
results that match the query, rather than failing if a result
is for a different host name than the query).

Task-number: QTBUG-24698
Change-Id: I327f31d58cdca50c7df6b32b275d7f28b56405f0
Reviewed-by: Jeremy Lainé <jeremy.laine@m4x.org>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoFix QUdpSocket bindMode autotest regression
Shane [Wed, 14 Mar 2012 13:18:20 +0000 (13:18 +0000)]
Fix QUdpSocket bindMode autotest regression

When binding with the DefaultForPlatform bindmode, then don't set
options on the socket related to sharability, leave them at the
platform default.

This restores compatiblity with Qt 4

Change-Id: I612a3acb976f08446b4eef03ccdcdf84b3477c3c
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>