profile/ivi/qtbase.git
12 years agoQtPrintSupport: Move printer list into plugin base class
John Layt [Fri, 1 Jun 2012 20:06:26 +0000 (21:06 +0100)]
QtPrintSupport: Move printer list into plugin base class

Move the cached printer list from the Windows plugin into the base
class so the CUPS plugin can also use it in a subsequent commit.

Change-Id: Idf5fb7fc49b1820aad58f16e8854ab9120caa193
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
12 years agoFix crash in qt_qpa_core_dispatcher() at application exit.
Miikka Heikkinen [Fri, 8 Jun 2012 07:20:46 +0000 (10:20 +0300)]
Fix crash in qt_qpa_core_dispatcher() at application exit.

In some situations it is possible to get events when QCoreApplication
has already cleared the 'self' pointer and will thus not return an
instance. For example, destroying screen at application exit when
there are parentless dialogs open will result in hiding the dialog,
which at least in Windows causes a call to
QWindowSystemInterface::handleExposeEvent() which will need the core
dispatcher down the line.

Fixed the crash by checking if the QCoreApplication instance is valid
instead of blindly using it. This should cause no problem as unhandled
events are simply queued.

Task-number: QTBUG-26061
Change-Id: Ide2350a62208433728e0271192c1da4b1efacc9b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove unused variable inSetParent
Girish Ramakrishnan [Fri, 8 Jun 2012 13:39:47 +0000 (06:39 -0700)]
Remove unused variable inSetParent

Change-Id: Ie65514209f14d8f8b2396c1d6e37cd8c3e4c0c1a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoUse variadic macros where available to make QSKIP source compatible.
Stephen Kelly [Thu, 7 Jun 2012 08:43:16 +0000 (10:43 +0200)]
Use variadic macros where available to make QSKIP source compatible.

Otherwise this is a large source incompatbility during porting, so
it makes sense to provide the option of using C++11 for that.

Change-Id: I9792b3ae2c1fa3743bc9a2e74380134ea2f24add
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix crash in QTreeWidgetItem::sortChildren when adding new item.
Markku Heikkila [Thu, 7 Jun 2012 14:30:04 +0000 (16:30 +0200)]
Fix crash in QTreeWidgetItem::sortChildren when adding new item.

This is a cherry-pick of 4f388c383e39b598d997e21bd9a4f16d89bd0625
from February

Recursive call is caused if user code calls QtreeWidgetItem()::sortChildren and
sorting is enbled in QTreeWidget.

First call is from user code and second is caused by timer.
When timer expires second call is made.

This recursion is prevented with QTreeModel::SkipSorting skipSorting()
in QTreeWidgetItem::sortChildren();

Task-number: QTBUG-20345
Change-Id: Ibf73e69274423f31397a9e391bfba7d5c4103a3c
Reviewed-by: Markku Tapio Heikkilä <markku.heikkila@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoeglfs: Disable eglfs when evdev is not present
Girish Ramakrishnan [Thu, 7 Jun 2012 22:05:19 +0000 (15:05 -0700)]
eglfs: Disable eglfs when evdev is not present

EGLFS has a hard dependency on evdev, so don't compile it when
evdev is not present.

This also removes the check that disabled EGLFS specifically for QNX.
Since QNX doesn't have evdev, EGLFS will get disabled automatically.

Change-Id: I9fdb364b2eff9b370fa238609a8f98af6ccb7f7b
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQDoc: Only print modulename::type on collision pages.
Casper van Donderen [Thu, 7 Jun 2012 11:43:19 +0000 (13:43 +0200)]
QDoc: Only print modulename::type on collision pages.

Change-Id: I090698b106456370f6c0982006243304f87dc70c
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoQtPrintSupport: Move plugin access of QPrinterInfo internals to base
John Layt [Fri, 1 Jun 2012 19:33:53 +0000 (20:33 +0100)]
QtPrintSupport: Move plugin access of QPrinterInfo internals to base

Move all plugin methods requiring access to QPrinterInfo internals
into the plugin base class, and remove the plugin classes as friends
from QPrinterInfo.

Change-Id: Ic527efc681e198abf19e038dd77c36bb8017d049
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
12 years agoReduce QtWidgets dependencies in the Cocoa plugin.
Morten Johan Sorvig [Tue, 22 May 2012 10:00:29 +0000 (12:00 +0200)]
Reduce QtWidgets dependencies in the Cocoa plugin.

b8246f08 added the new menus implementation which
removes one of the major QtWidget dependencies.

Continuing on the path to QtWidget-freedom this
commit removes the following:
- qmenu_mac.h/mm. Not used.
- FORMS += filedialog.ui. Not used.
- qt_strippedText from qaction.cpp. Duplicate.
- Misc stray includes.

What is left should be the dependencies needed by
the print engine implementation. These will be
handled at a later time.

Change-Id: I0cead4cdaddcebd402d30c6112f3e889d0f28740
Conflicts:
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoMake qfont autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 12:00:47 +0000 (14:00 +0200)]
Make qfont autotest build without widgets

Change-Id: I2ab344d44cb2aa8c59c1c28f7368784849d4b74d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake qicon autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 11:35:14 +0000 (13:35 +0200)]
Make qicon autotest build without widgets

Change-Id: Ic6176404076bac956d00d57c99e0bbf0ac78beca
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAdd Qt::WindowTransparentForInput to Window flags manual test.
Friedemann Kleint [Thu, 7 Jun 2012 09:00:31 +0000 (11:00 +0200)]
Add Qt::WindowTransparentForInput to Window flags manual test.

Change-Id: If27567a93d5a2e910289c680643503d02831d742
Reviewed-by: jian liang <jianliang79@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix a crash when calling effectiveWinId() on parentless widgets.
Friedemann Kleint [Thu, 7 Jun 2012 10:37:10 +0000 (12:37 +0200)]
Fix a crash when calling effectiveWinId() on parentless widgets.

Remove the assert as it also triggers when the widget is one
that currently has no parent (setParent(0)).
Check that the WinId is != 0 in the cursor code.

Change-Id: I711fc600f1d803c8f01c15df87984e742a4c23d2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoRemove widgets lib dependency on platformsupport.
Frederik Gladhorn [Wed, 6 Jun 2012 13:01:59 +0000 (15:01 +0200)]
Remove widgets lib dependency on platformsupport.

Instead of the dependency add the one needed function as virtual to
the QPlatformServices in QtGui.

Change-Id: Ia4455f5ac88ec4d0480bd81635cebba62bbd8ac5
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoAllow ISODate string without seconds in QTime::fromString().
Mitch Curtis [Tue, 5 Jun 2012 14:18:59 +0000 (16:18 +0200)]
Allow ISODate string without seconds in QTime::fromString().

According to ISO 8601 (section 4.2.2.3), seconds can be omitted
from a string representing time.

Task-number: QTBUG-2813
Change-Id: I2578f290845e46a8f49be489f1d7427984ae7f08
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoNamespace the bundled zlib symbols, to avoid clash with user zlib
aavit [Wed, 6 Jun 2012 13:16:49 +0000 (15:16 +0200)]
Namespace the bundled zlib symbols, to avoid clash with user zlib

When Qt is being compiled and is using the bundled zlib, QtCore needs
to export the zlib symbols, since zlib is needed in other Qt
libraries as well. That gives a danger of a potentially disastrous
symbol clash if the user later on links with both Qt and an external
zlib (ref. e.g. QTBUG-15071).

This commit enables a zlib compilation flag that causes all zlib
symbols to be redefined with a prefix. Hence, they will not clash
with a standard zlib.

A minor drawback is that zlib.h will now have #defines for a few
semi-normal identifiers. Hence, a couple of more changes are done:
In the private qzip code, the identifer crc32 had to be renamed.
QHttpNetworkReplyPrivate needed no change, but as a defensive measure
the #include <zlib.h> is moved from the _p.h file to the .cpp file,
to avoid surprising compilation errors later in code that include
that header.

This commit does not in itself solve the issue of how to let Qt
libraries outside of qtbase use the same bundled zlib, but it is
a prerequisite for that.

Change-Id: If84105901a8c90d35009faffe660c85a6bd2fee5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove dependency from QFactoryInterface for the print plugin
Lars Knoll [Sun, 27 May 2012 03:25:47 +0000 (05:25 +0200)]
Remove dependency from QFactoryInterface for the print plugin

Change-Id: Ia35890b72e7797ef655bf97b4a34af2908657c0e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove QFactoryInterface from the input plugins
Lars Knoll [Sun, 27 May 2012 03:16:14 +0000 (05:16 +0200)]
Remove QFactoryInterface from the input plugins

Change-Id: Ia4a9dc5b4ef276dca39681848e531b4c9e4f64e2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove QFactoryInterface from bearer plugins
Lars Knoll [Sun, 27 May 2012 03:04:48 +0000 (05:04 +0200)]
Remove QFactoryInterface from bearer plugins

Change-Id: I8d6736e56f34f49041fff409d040634475eb0bf5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove the QFactoryInterface dependency from platform plugins
Lars Knoll [Sun, 27 May 2012 02:57:31 +0000 (04:57 +0200)]
Remove the QFactoryInterface dependency from platform plugins

Change-Id: I4010e59dcd8a790e06bb9a0ccf3cc9a5c7737ed1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove QFactoryInterface from the generic plugins
Lars Knoll [Sun, 27 May 2012 02:51:45 +0000 (04:51 +0200)]
Remove QFactoryInterface from the generic plugins

Change-Id: I5a4351ca4b6605f9628496701bb8c6063cf36c78
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove QFactoryInterface from picture plugins
Lars Knoll [Sun, 27 May 2012 02:09:13 +0000 (04:09 +0200)]
Remove QFactoryInterface from picture plugins

Change-Id: I7b02cbfb850d6a9fc90c1eb1e12a9950baf61e77
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove QFactoryInterface dependency from icon plugins
Lars Knoll [Sun, 27 May 2012 02:02:09 +0000 (04:02 +0200)]
Remove QFactoryInterface dependency from icon plugins

Change-Id: I65bed1646f3c5e89329a6bbe3dcdbdb5660b7004
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove the QFactoryInterface dependency from accessible plugins
Lars Knoll [Sun, 27 May 2012 01:47:28 +0000 (03:47 +0200)]
Remove the QFactoryInterface dependency from accessible plugins

QFactoryInterface is not needed anymore and will get removed soon.

Change-Id: Ib2806200b1a7f4a45d62e2b556380946ef68f585
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoDon't inherit from QFactoryInterface for image plugins
Lars Knoll [Sun, 27 May 2012 01:40:00 +0000 (03:40 +0200)]
Don't inherit from QFactoryInterface for image plugins

QFactoryInterface is obsolete now that we have the new plugins loading
mechanism, where we can get the keys out of the plugin without
having to load it. Remove it from QImageIOHandlerFactoryInterface
as a first step of getting completely rid of it.

Change-Id: I856b149dd20131e1cdcdcb271c1a355c9e0da6ab
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix eglfs regression in configure
Donald Carr [Thu, 7 Jun 2012 08:34:33 +0000 (08:34 +0000)]
Fix eglfs regression in configure

XPLATFORM_QNX was never explicitly set, yet the tests which evaluate it
assume that it is.

Change-Id: If97d2ee1f4432ada0c68e36348bf5bec85f94e43
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoSIC: QPrintSupport - Remove options api from QPageSetupDialog
John Layt [Sun, 20 May 2012 19:38:21 +0000 (20:38 +0100)]
SIC: QPrintSupport - Remove options api from QPageSetupDialog

QPageSetupDialog has an enum PageSetupDialogOption, however one option
had support removed in Qt 4.5 and the remaining 2 are actually for an
internal implementation detail that could lead to memory leaks if
changed by an app.

This change removes the enum and the api as they is now useless.

Change-Id: I9a3ab689dcab57151de894db5ebf22f6ad90d71e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: John Layt <jlayt@kde.org>
12 years agoShift positions for lineBreakType
Konstantin Ritt [Wed, 6 Jun 2012 15:00:21 +0000 (18:00 +0300)]
Shift positions for lineBreakType

to keep them consistent with positions for all other flags.
This changes the internal behavior so that attributes[0].lineBreakType now means
"break opportunity at start of the text (before the first character in the string)"
and is always assigned with HB_NoBreak to conform rule LB2
(see http://www.unicode.org/reports/tr14/#LB2).

The current implementation is based on the sample implementation from tr14
that aimed to be as simple as possible rather than to be optimal.
From now, we can use pieces of the attributes array "as is"
without having to adjust some positions. Or we can analize some long text
by chunks (e.g. paragraph by paragraph) and consume less memory.

This introduces a minor overhead that will be eliminated shortly.

Change-Id: Ic873a05a9d5203b1c3d5aff2e4445a3f034c4bd2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQTextBoundaryFinder: Consider soft hyphen as line breaking opportunity
Konstantin Ritt [Fri, 25 May 2012 02:00:28 +0000 (05:00 +0300)]
QTextBoundaryFinder: Consider soft hyphen as line breaking opportunity

SoftHyphen enum value was added to specify such a boundary reason

Change-Id: I4248909eed6ab8cbca419de4dcf9fe917620a158
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoSet the whiteSpace flag outside the grapheme and the line breaking loop
Konstantin Ritt [Tue, 5 Jun 2012 08:19:22 +0000 (11:19 +0300)]
Set the whiteSpace flag outside the grapheme and the line breaking loop

The white spaces determination doesn't belong to the text breaking algorithm.
A proper breaking implementation shouldn't assume spaces are
break opportunities (actually, space is allowed to be a grapheme base);
However, the whiteSpace flag should never be checked alone while iterating
over the text to find the space sequence; the grapheme boundaries should always
be taken into account. This covers the SMP code points in UTF-16 text and
graphemes that consist of a space followed with one or more grapheme extenders.

This introduces a minor overhead that would be eliminated some later.

Change-Id: Ic2cc7f485631fd0b436fc256ce112ded5f94fc07
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove QFactoryInterface from sql drivers
Lars Knoll [Sun, 27 May 2012 03:34:53 +0000 (05:34 +0200)]
Remove QFactoryInterface from sql drivers

Change-Id: Ib31e6c4ce5264fc1e4281c8846df5630a6479a7c
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDeprecate the use of QWeakPointer to track QObjects.
Stephen Kelly [Fri, 25 May 2012 08:31:03 +0000 (10:31 +0200)]
Deprecate the use of QWeakPointer to track QObjects.

The main problem with using QWeakPointer to track QObjects is that it
has API to convert to QSharedPointer, which is undefined behavior. There
is no need to overload the meaning of QWeakPointer with QObject
tracking.

QPointer is more suitable and should be used instead. Because QPointer
is implemented in terms of QWeakPointer, we need to add some overloads
which are not deprecated.

Change-Id: If0333e4800c9fd277629cc69185c9ca3e4e7e81d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoExpand the 'existing target guard' in generated CMake files.
Stephen Kelly [Fri, 18 May 2012 18:10:46 +0000 (20:10 +0200)]
Expand the 'existing target guard' in generated CMake files.

This way the target will be created and have its properties
populated only one time.

I tried wrapping the whole file in an 'include guard', but that
broke the unit test in tests/auto/cmake/pass1 (and
the qt5_use_module function), because the function causes the
variables in the Config file to not exist outside of the
scope (eg for include directories), and yet, Qt5${Module}_FOUND is
still true even when the find_package was previously called in a
function, so it is not found and processed again.

The change in Qt5CoreConfigExtras.cmake does not need to be guarded
as it is only ever included from Qt5CoreConfig.

Change-Id: Iaa016563db5eb61294360ac9e003c9c923393d8c
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoAdded SpellCheckUnderlineStyle theme hint.
Samuel Rødal [Fri, 1 Jun 2012 08:32:17 +0000 (10:32 +0200)]
Added SpellCheckUnderlineStyle theme hint.

Task-number: QTBUG-25115
Change-Id: I70abbed426ad8bebca51823ed5ce16f2f300b5cc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWindows: Store only full-size DC's obtained by BeginPaint.
Friedemann Kleint [Thu, 7 Jun 2012 11:42:13 +0000 (13:42 +0200)]
Windows: Store only full-size DC's obtained by BeginPaint.

Avoid painting bugs in case the DC covers only a part of the
window and QBackingStore does a full flush.

Task-number: QTBUG-26039

Change-Id: Ic918d9898ac824690273ac59bcb1e7e546cc698a
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix compilation of examples with -no-widgets
Kent Hansen [Tue, 5 Jun 2012 12:32:07 +0000 (14:32 +0200)]
Fix compilation of examples with -no-widgets

Change-Id: Ie0e19daf6c6476b5c5130f4930dfa3df92917384
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake qtexttable autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 12:07:05 +0000 (14:07 +0200)]
Make qtexttable autotest build without widgets

Change-Id: Id5f93dee0c4b5978c473838559f586ced35a2981
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake sql autotests build without widgets
Kent Hansen [Tue, 5 Jun 2012 12:10:02 +0000 (14:10 +0200)]
Make sql autotests build without widgets

Change-Id: Icd4d2ef39961e2e0ec5c9e910c74b3e8a35503bf
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake "other" autotests build without widgets
Kent Hansen [Tue, 5 Jun 2012 12:16:16 +0000 (14:16 +0200)]
Make "other" autotests build without widgets

Change-Id: I49e73c31b98e43259771c0e265cf13fc167c45f2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDon't build printsupport autotests when widgets aren't available
Kent Hansen [Tue, 5 Jun 2012 12:22:12 +0000 (14:22 +0200)]
Don't build printsupport autotests when widgets aren't available

Change-Id: Ida376a75f376fc0d3696d715648c7229aec301e2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix common device spec paths
Donald Carr [Wed, 6 Jun 2012 15:54:55 +0000 (15:54 +0000)]
Fix common device spec paths

This fixes breakage in the Raspberry Pi spec introduced in:

https://codereview.qt-project.org/#change,27536

due to incorrect depth assumptions regarding included files.

Change-Id: I802b828f1755f299939fed192dd3ca9bf1a83002
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoRemove widgets dependency from xmlstreamlint example
Kent Hansen [Tue, 5 Jun 2012 07:12:28 +0000 (09:12 +0200)]
Remove widgets dependency from xmlstreamlint example

Change-Id: I2c7609077bd18864ffd9b2ba5086eb590aff3df0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove widgets dependency from qtconcurrent/map autotest
Kent Hansen [Tue, 5 Jun 2012 12:32:52 +0000 (14:32 +0200)]
Remove widgets dependency from qtconcurrent/map autotest

Change-Id: I734ae73a530ab6eb27271586040ef910e6ad0e2c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake animation autotests build without widgets
Kent Hansen [Tue, 5 Jun 2012 11:04:28 +0000 (13:04 +0200)]
Make animation autotests build without widgets

Change-Id: Icb0560a26973921611f697240fbce121fff518e9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove widgets dependency from qdatastream autotest
Kent Hansen [Tue, 5 Jun 2012 11:06:27 +0000 (13:06 +0200)]
Remove widgets dependency from qdatastream autotest

Change-Id: I30ce3ce2d5a0badc7a846256825b4deea8c0856a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake qprocess autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 11:08:16 +0000 (13:08 +0200)]
Make qprocess autotest build without widgets

Change-Id: I0a428852222accbea8446ba1c284f1c44b9d4bf3
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove widgets dependency from qstringlistmodel autotest
Kent Hansen [Tue, 5 Jun 2012 12:51:05 +0000 (14:51 +0200)]
Remove widgets dependency from qstringlistmodel autotest

Change-Id: I9678f9ee3fd8b01648cf2524452145568cf6fb4f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake itemmodels autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 12:51:32 +0000 (14:51 +0200)]
Make itemmodels autotest build without widgets

Change-Id: I7ff1a575c111452397c3461842c15bb01105cf95
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake qstatemachine autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 11:23:39 +0000 (13:23 +0200)]
Make qstatemachine autotest build without widgets

Change-Id: I3a58cb1cbe0c86aca6e533187e85c166bf0f8957
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake qpixmap autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 11:28:16 +0000 (13:28 +0200)]
Make qpixmap autotest build without widgets

Change-Id: Iabf1e6815a2af79d9da84c0e2bb9c2de52cb698f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake qpicture autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 11:34:17 +0000 (13:34 +0200)]
Make qpicture autotest build without widgets

Change-Id: Id2047dace7b3087f1c7b83545f5e122ab936d33c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake qmovie autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 11:34:33 +0000 (13:34 +0200)]
Make qmovie autotest build without widgets

Change-Id: Ie53b183e99de08c3cc35f4932b7aabf4bf5b0940
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoget rid of "uninitialized member" gcc warning
Konstantin Ritt [Wed, 6 Jun 2012 14:51:49 +0000 (17:51 +0300)]
get rid of "uninitialized member" gcc warning

Change-Id: I486212829ec9309239645222e7f03f36ae4847f0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoMark the testSslOption method as introduced in Qt 4.8
Laszlo Papp [Wed, 6 Jun 2012 16:27:38 +0000 (19:27 +0300)]
Mark the testSslOption method as introduced in Qt 4.8

Change-Id: Ibe7cb1ca9cdcedd3f09dd4f865907e3f0fa6aef3
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoMake gui tests build when widgets aren't available
Kent Hansen [Tue, 5 Jun 2012 11:39:04 +0000 (13:39 +0200)]
Make gui tests build when widgets aren't available

Change-Id: I5b75116d148f84ae2f96dd6b573d14952c4b601c
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoMake qpainter autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 11:58:15 +0000 (13:58 +0200)]
Make qpainter autotest build without widgets

Change-Id: I4e05871e44f7a69aaa9cd5d876c249c7dd9d86e8
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoMake qtextdocumentlayout autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 12:02:51 +0000 (14:02 +0200)]
Make qtextdocumentlayout autotest build without widgets

Change-Id: Ib767f9cac5fc3274ed16e87f0c4da68102147645
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake qtextobject autotest build without widgets
Kent Hansen [Tue, 5 Jun 2012 12:04:49 +0000 (14:04 +0200)]
Make qtextobject autotest build without widgets

Change-Id: I9ea79b62d22faeccc07d8c21a0d8f032b40abef0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQNX: Take nativeOrientation into account for QNX device orientations
Sean Harmer [Wed, 6 Jun 2012 10:12:25 +0000 (11:12 +0100)]
QNX: Take nativeOrientation into account for QNX device orientations

Change-Id: Idfe4a5bd9c9638a1f9ae52a7b1def3f869286587
Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
12 years agoQtNetwork: disconnect other channels when network layer detected
Martin Petersson [Wed, 6 Jun 2012 11:47:54 +0000 (13:47 +0200)]
QtNetwork: disconnect other channels when network layer detected

With Happy Eyeballs we will connect one IPv4 and one IPv6 channel and
pick the network layer depending on which connects first. When the
first channel is connected we can close the other one.

Before this we let the other connection finish connecting and then
closed it. This will close the other one as soon as the first one
is connected.

Change-Id: Ib2ab3f949704fd39dc0584bd31b9bcaf75ce35f7
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoAdd Blackberry path for SSL certificates
Nicolas Arnaud-Cormos [Mon, 4 Jun 2012 15:52:44 +0000 (08:52 -0700)]
Add Blackberry path for SSL certificates

Change-Id: Ic01e4bddaa6f1fd94f16952e0818f4369c2ec8ab
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoUse the correct ifdef (QT_WIDGETS_LIB) in qsqlrelationaldelegate.h
Kent Hansen [Wed, 6 Jun 2012 11:12:50 +0000 (13:12 +0200)]
Use the correct ifdef (QT_WIDGETS_LIB) in qsqlrelationaldelegate.h

Change-Id: I4cdb1eef7dab55c7d295463fe8ad29b5480b0788
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRename QSystemLocale::fallbackLocale() to QSystemLocale::fallbackUiLocale()
Mike FABIAN [Mon, 4 Jun 2012 15:08:27 +0000 (17:08 +0200)]
Rename QSystemLocale::fallbackLocale() to QSystemLocale::fallbackUiLocale()

Suggested by Oswald Buddenhagen. This function is about the (main)
UI language, not about other locale features like number formatting etc.
It not in the public API anymore in Qt 5.0 so it can be renamed.

Change-Id: I2a23892c67e5813de4c0e57330749568777e9ee6
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoCheck LANGUAGE as well in QSystemLocale::fallbackLocale
Mike FABIAN [Mon, 4 Jun 2012 15:53:34 +0000 (17:53 +0200)]
Check LANGUAGE as well in QSystemLocale::fallbackLocale

Because QSystemLocale::fallbackLocale() is about UI languages,
it makes sense to check LANGUAGE as well if appropriate.
Adapt tst_qlocale.cpp accordingly.

Suggested by Oswald Buddenhagen.

Change-Id: Ib2c9674081809e3251be4e34456b05210eebc010
Reviewed-by: Oswald Buddenhagen
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoUse LC_MESSAGES instead of LC_NUMERIC in QSystemLocale::fallbackLocale()
Mike FABIAN [Mon, 4 Jun 2012 07:50:07 +0000 (09:50 +0200)]
Use LC_MESSAGES instead of LC_NUMERIC in QSystemLocale::fallbackLocale()

commit b9790a04eeba664ecdf9ace24911094a71b5f0bd
(https://codereview.qt-project.org/24304) introduced the problem that
the country gets initialized from LC_NUMERIC and the language from
LC_MESSAGES. For example, if LC_NUMERIC=ru_RU and LC_MESSAGE=fr_FR,
then QLocale::system().name() returns "fr_RU". It is not nice to mix
the values of two LC_ variables there. Therefore, revert this change
and use LC_MESSAGES instead of LC_NUMERIC in
QSystemLocale::fallbackLocale(). This was also suggested in the
changelog of b9790a04 and it looks like a better way to fix the
problem.

Change-Id: I8fa6fec2b33e9f1f5a31c4b288503a658dad6d30
Reviewed-by: Denis Dzyubenko
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFixed compile error in eglfs plugin due to narrowing conversion.
Samuel Rødal [Wed, 6 Jun 2012 06:13:53 +0000 (08:13 +0200)]
Fixed compile error in eglfs plugin due to narrowing conversion.

qeglfscursor.cpp:300: error: narrowing conversion of
‘((const QRectF*)r)->QRectF::left()’ from ‘qreal’ to ‘const GLfloat’
inside { }

Change-Id: Ic4273828ad361ffac5a68068372bf400d468fb38
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoTest if the device is grabbed in some of the evdev plugins
Laszlo Agocs [Wed, 6 Jun 2012 11:09:41 +0000 (14:09 +0300)]
Test if the device is grabbed in some of the evdev plugins

Even though they target embedded devices, the touch and tablet plugins
are very often used on desktop, under X, for development and
experimenting. However the X.org drivers like to grab the input
devices, resulting in getting no events when reading
directly. Inspired by evtest, we show a warning from now on in this
case so the user has a clue what's going on.

Change-Id: I19474f1fcc5163f2601e7000aaee0cce54f99367
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agostatemachine: Make delayed event posting work from secondary thread
Kent Hansen [Mon, 4 Jun 2012 19:51:04 +0000 (21:51 +0200)]
statemachine: Make delayed event posting work from secondary thread

postDelayedEvent() and cancelDelayedEvent() are marked as thread-safe
in the documentation. Unfortunately, they didn't actually work when
called from another thread; they just produced some warnings:

QObject::startTimer: timers cannot be started from another thread
QObject::killTimer: timers cannot be stopped from another thread

As the warnings indicate, the issue was that postDelayedEvent()
(cancelDelayedEvent()) unconditionally called QObject::startTimer()
(stopTimer()), i.e. without considering which thread the function
was called from.

If the function is called from a different thread, the actual
starting/stopping of the associated timer is now done from the
correct thread, by asynchronously calling a private slot on the
state machine.

This also means that the raw timer id can no longer be used as the
id of the delayed event, since a valid event id must be returned
before the timer has started. The state machine now manages those
ids itself (using a QFreeList, just like startTimer() and
killTimer() do), and also keeps a mapping from timer id to event
id once the timer has been started. This is inherently more complex
than before, but at least the API should work as advertised/intended
now.

Task-number: QTBUG-17975
Change-Id: I3a866d01dca23174c8841112af50b87141df0943
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoQSqlResult: replace virtual hooks with virtual functions
Mark Brand [Tue, 5 Jun 2012 11:50:03 +0000 (13:50 +0200)]
QSqlResult: replace virtual hooks with virtual functions

Instead of virtual functions which would have broken binary
compatibility, virtual_hook() was used to implement the virtual
functionality. Now, since the step to Qt 5.0 allows breaking
binary compatibility, we take the opporunity to simplify the code
using real virtual functions.

SetNumericalPrecision --> setNumericalPrecisionPolicy()
NextResult --> nextResult()
DetachFromResultSet --> detachFromResultSet()
BatchOperation --> execBatch()

Task-number: QTBUG-25252
Change-Id: Idd3a870f876d8b8a7457559d5f31ec2073786a75
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
12 years agoRemove insignificant_test for tst_qwindow on Mac OS X
Bradley T. Hughes [Wed, 6 Jun 2012 09:31:41 +0000 (11:31 +0200)]
Remove insignificant_test for tst_qwindow on Mac OS X

tst_QWindow::positioning() still fails on Mac OS X, and it does so in
several places. Skip this test for now as it causes isActive() to fail
as well. With positioning() QSKIP()ed, all the other test functions
pass:

Totals: 19 passed, 0 failed, 1 skipped
********* Finished testing of tst_QWindow *********

Task-number: QTBUG-23059
Change-Id: I58d036120c0121f515813cd20955ab3b82f81fe1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoDo not build eglfs QPA when cross compiling for QNX
Sean Harmer [Tue, 5 Jun 2012 09:35:34 +0000 (10:35 +0100)]
Do not build eglfs QPA when cross compiling for QNX

Commit 2a1b50d67c1f2f4c5bd5efe048080989db37f44f introduced a dependency
on evdev for eglfs which QNX does not provide. QNX also has a dedicated
QPA plugin so the eglfs plugin is not needed there.

It is not possible to use the -device configure defaults approach as
it is not cross-platform.

Change-Id: I2d151f16cf1a9576a0b0b528f0e9c17834c66e91
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoCocoa: do not send multiple window activation events
Bradley T. Hughes [Wed, 6 Jun 2012 07:25:01 +0000 (09:25 +0200)]
Cocoa: do not send multiple window activation events

When switching the active window within the same application, Cocoa
sends us an NSWindowDidResignKeyNotification for the old activated
window, then an NSWindowDidBecomeKeyNotificationfor the newly activated
window. Our handling of this would first set Qt's active window to zero,
then immediately reset it afterwards. Avoid this by checking the key
window when handling the deactivation event, and don't set the active
window to zero if a new window has become active.

Task-number: QTBUG-24322
Change-Id: I8719fc501049eeaaebb75e9ea03261b2209458b6
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAdded QScreen::setOrientationUpdateMask().
Samuel Rødal [Tue, 5 Jun 2012 12:17:24 +0000 (14:17 +0200)]
Added QScreen::setOrientationUpdateMask().

It might be too expensive to always have an accelerometer sensor
running, so introduce API so that the application has to explictly ask
to get the orientation updates it's interested in.

Change-Id: Ib7dc5ad8807718409f744ebef53f4476aa05175d
Reviewed-by: Ian Monroe <ian.monroe@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Kevin Ottens <kevin.ottens.qnx@kdab.com>
12 years agoCocoa: Fix QCocoaBackingStore::flush on 10.8
Morten Sorvig [Fri, 25 May 2012 09:36:03 +0000 (11:36 +0200)]
Cocoa: Fix QCocoaBackingStore::flush on 10.8

The call to displayRect works on 10.7 but does not
update the pixels on screen on 10.8. Many Qt windows
do not update properly.

This is a workaround found by trail and error
without fully understanding the underlying issue.
I would like to have this in place until we can
determine the cause of the bug.

Change-Id: I1ecee745f42a93ded4f651cc8ad51963f250e78d
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix compilation when configured with -no-widgets
Kent Hansen [Tue, 5 Jun 2012 06:56:00 +0000 (08:56 +0200)]
Fix compilation when configured with -no-widgets

printsupport plugins need QtPrintSupport (which needs QtWidgets).

Change-Id: I8cc9cc15abd19c95b8d4bac26dfd17d027bbfa96
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoExport QPlatformIntegrationFactory to make it usable outside of QtGui.
Balazs Kelemen [Tue, 5 Jun 2012 14:19:10 +0000 (16:19 +0200)]
Export QPlatformIntegrationFactory to make it usable outside of QtGui.

QPlatformIntegrationFactory can be used to load a platform plugin dynamically.
It can be useful for an external platform plugin that want to define some
behaviour on it's own and use the default plugin for the rest. We are going
to implement such a plugin in WebKit for the test infrastructure to tweak
the platform backends in order to provide more platform independent layout
test results.

Change-Id: Iaaabe1cbc173a03132d83474faa7858aead4cae0
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoFixed QJsonObject::find()
Denis Dzyubenko [Mon, 4 Jun 2012 16:52:36 +0000 (18:52 +0200)]
Fixed QJsonObject::find()

The function returns mutable iterator on the object that can later be passed to
e.g. erase(), hence it should detach() to be consistent with
QJsonObject::begin() which also detaches.

Change-Id: Id79e8e012fd5469e06b68fbc9eecb7c6848ce9c1
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
12 years agonormalize the process arguments to Normalization Form D on mac
Konstantin Ritt [Wed, 11 Apr 2012 08:00:55 +0000 (11:00 +0300)]
normalize the process arguments to Normalization Form D on mac

QFile::encodeName() does this for us + simplifies the code a bit

Change-Id: Id2ca2615e20408229dd021c26587fefd60365352
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoDo not set an action on native submenu items on Mac
Pasi Matilainen [Mon, 2 Apr 2012 10:38:03 +0000 (13:38 +0300)]
Do not set an action on native submenu items on Mac

On Mac, clicking on a submenu entry triggers QMenu::triggered(QAction*)
signal, which is unexpected, and also closes the submenu, which does
not match platform behavior. This happens because native submenu items
have an action set, so fix it by not setting the action.

Task-number: QTBUG-16738
Task-number: QTBUG-10706
Change-Id: I6819999e5af35e6acab1aec035d5d85445189f11
Reviewed-by: James Turner <james.turner@kdab.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoRemove support for Qt 4 style plugins
Lars Knoll [Sat, 2 Jun 2012 03:42:13 +0000 (05:42 +0200)]
Remove support for Qt 4 style plugins

The new plugin format allows us to avoid loading the plugins in
all cases. Remove the old format, as we could get bad behavior
with the old format if Qt would try to dlopen a Qt 4.x plugin.

Change-Id: I2193e6874d6cca3c0b12298c2b9beb4105a42fd5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoUpdate of the plugin documentation
Lars Knoll [Sun, 27 May 2012 01:04:44 +0000 (03:04 +0200)]
Update of the plugin documentation

Moved the plugin overview from qtdoc to qtbase. Updated
the docs to describe the new plugin mechanism.

Change-Id: I1b92d5099aeaa3a166c1f7698176d811d47c3392
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove references to QtSharedPointer::InternalRefCount
Thiago Macieira [Wed, 23 May 2012 16:34:38 +0000 (18:34 +0200)]
Remove references to QtSharedPointer::InternalRefCount

This class does not exist, is not needed and has never been published
in a released version of Qt.

It existed during the development of QSharedPointer, when internal
reference counting (also known as intrusive counting) was a goal. That
goal was abandoned when use with forward-declared classes was
preferred.

Change-Id: If3a5a29c07fc71e2001d6ba64b90ddd241ab8ae3
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoGeneralize common device properties out of Raspberry Pi spec
Donald Carr [Thu, 31 May 2012 03:18:26 +0000 (03:18 +0000)]
Generalize common device properties out of Raspberry Pi spec

Change-Id: I58cc9c9219bf3e9ed8e7401cb66f968306d7bfc9
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoeglfs refactor: Query screen and format info from hooks
Girish Ramakrishnan [Fri, 1 Jun 2012 19:18:45 +0000 (12:18 -0700)]
eglfs refactor: Query screen and format info from hooks

This allows boards to customize what they really work best for
without having to set environment variables.

Change-Id: Ib40c3a870ade568f66e37e621a8abc6b17e39411
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoeglfs refactor: Move egl initialization to the integration
Girish Ramakrishnan [Fri, 1 Jun 2012 19:04:35 +0000 (12:04 -0700)]
eglfs refactor: Move egl initialization to the integration

Change-Id: If2c870538c742fd034fb9e5c115e4ac0bd8e2e03
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoVerify the surfaceType before activating the GL context
Holger Hans Peter Freyther [Tue, 29 May 2012 13:23:25 +0000 (15:23 +0200)]
Verify the surfaceType before activating the GL context

Verify that the surfaceType() of the QPlatformContext is of type
OpenGLSurface before making the context active. Make it possible
to get the QSurface from a QPlatformSurface, make QPlatformWindow
use that to access the QWindow. Remove the setSurfaceType call from
the eglfs plugin as this hiding a problem.

Change-Id: I08906da052e066bb1f1f042030643c6389ab17d7
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoUse QPointer instead of QWeakPointer.
Stephen Kelly [Wed, 30 May 2012 11:53:24 +0000 (13:53 +0200)]
Use QPointer instead of QWeakPointer.

The use of QWeakPointer for tracking QObject pointers is to be
deprecated.

Change-Id: If460ca7f515db77af24030152f4bd56e1a5fae7c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove useless "QT += widgets"
Kent Hansen [Tue, 5 Jun 2012 12:36:41 +0000 (14:36 +0200)]
Remove useless "QT += widgets"

These .pro files have TEMPLATE=subdirs, so there's no reason to be
adding libraries here.

Change-Id: I0fb0a44107710ee746d354106d0c46006958ee62
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAvoid string-based lookup of signals
Kent Hansen [Mon, 4 Jun 2012 06:37:55 +0000 (08:37 +0200)]
Avoid string-based lookup of signals

Resolving signals by member function is preferable.

Change-Id: I2a47a27bc780c4c3c29cf472f9f063c910e20c18
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoQNX: Implement QQnxScreen::nativeOrientation()
Kevin Ottens [Fri, 25 May 2012 09:14:11 +0000 (11:14 +0200)]
QNX: Implement QQnxScreen::nativeOrientation()

Provide a proper version of nativeOrientation(). We use the screen
physical size as reported by the device to determine its native
orientation.

Change-Id: I45b593b0d62436529f89050e98e10b8c9463b6b9
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoIntroduce nativeOrientation() to QPlatformScreen
Kevin Ottens [Fri, 25 May 2012 08:30:52 +0000 (10:30 +0200)]
Introduce nativeOrientation() to QPlatformScreen

Now QPlatformScreen has a nativeOrientation() method which default
implementation return Qt::PrimaryOrientation. Its purpose is to return
the native orientation of the device (e.g. when the device logo is right
up).

Only the QPA backend can know for sure what this native orientation is,
so allow QPA backends to override it with a finer result.

Change-Id: I3bef14acb6b8568e64398ff919d9cb4461a2c9cc
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoWrite test to confirm QStateMachine calls connectNotify().
Mitch Curtis [Fri, 1 Jun 2012 12:31:12 +0000 (14:31 +0200)]
Write test to confirm QStateMachine calls connectNotify().

Task-number: QTBUG-16628
Change-Id: I77535fcb9a6ae306df8ccd670ee1bfc32721d66a
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoQDoc: Look for template and include() under installdir.
Casper van Donderen [Tue, 5 Jun 2012 11:58:31 +0000 (13:58 +0200)]
QDoc: Look for template and include() under installdir.

The installdir will now also be used to search for include() qdocconf
variables and the stylesheet.

Change-Id: I388392114fd5a8d57bab0b71699b30e4a6ddd46e
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoCorrectly locate files with relative paths
Lars Knoll [Fri, 4 May 2012 09:21:49 +0000 (11:21 +0200)]
Correctly locate files with relative paths

QUrl("relativefilename").toLocalFile() changed behavior
and now returns an empty string if the scheme is not set.
Setting the scheme to "file:" in setSource would however
break some other assumptions in the code about relative
url's.

Task-number: QTBUG-22416
Change-Id: I1b3fcbef81f6e356935ec426903989e783ce9a78
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix Mac support for glyph scaling
Jiang Jiang [Mon, 4 Jun 2012 17:38:10 +0000 (19:38 +0200)]
Fix Mac support for glyph scaling

Change-Id: I9ac9da86c38e9313c6219b8049e46b6b58fa6731
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoMake QIODevice::seek() return false for sequential files.
Mitch Curtis [Tue, 29 May 2012 10:01:24 +0000 (12:01 +0200)]
Make QIODevice::seek() return false for sequential files.

Task-number: QTBUG-18173
Change-Id: Ie3a96d3a6f60995b8ba7823153778869d0c2dc58
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoconfigure: Auto-detect and enable C++11 support if available
Bradley T. Hughes [Tue, 29 May 2012 05:10:09 +0000 (07:10 +0200)]
configure: Auto-detect and enable C++11 support if available

Enabling support for C++11 adds CONFIG+=c++11 to the Qt build. Projects
using Qt can check for C++11 support using contains(QT_CONFIG, c++11) in
their .pr[iof] files.

The QMAKE_CXXFLAGS_CXX11 and QMAKE_LFLAGS_CXX11 qmake varibles contain
any arguments the compiler needs to enable C++11. CONFIG+=c++11 adds
these arguments to the build.

Support for clang, g++, and the Intel C++ Compiler for Linux are
included in this commit.

Change-Id: Id77f86d7ad4d5c740b890446a40b105879a0d327
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agodirectfb: Compile with C++11 support enabled
Bradley T. Hughes [Tue, 5 Jun 2012 06:18:41 +0000 (08:18 +0200)]
directfb: Compile with C++11 support enabled

qdirectfbblitter.cpp:146: error: narrowing conversion of 'srcRect.x()'
from 'qreal' to 'int' inside { }
qdirectfbblitter.cpp:152: error: narrowing conversion of 'rect.x()' from
'qreal' to 'int' inside { }

The same error exists for calls to y(), width(), and height() at both
locations.

Change-Id: I14f165a6a1cab9502e157e798157b835faf2300f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQDoc: search for example projectPath for manifest.
Casper van Donderen [Mon, 4 Jun 2012 15:29:53 +0000 (17:29 +0200)]
QDoc: search for example projectPath for manifest.

Previously qdoc would automatically use the first .pro/.qmlproject file
found, now it explicitly searches for a .pro/.qmlproject file with the
name of the example.

Change-Id: I2552e529bd3d1b724d3b4286d98d664edbbabcf2
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agotst_qtoolbutton: stabilize and improve failure message
Rohan McGovern [Tue, 5 Jun 2012 04:24:18 +0000 (14:24 +1000)]
tst_qtoolbutton: stabilize and improve failure message

Allow for a little more leeway in timers.

Task-number: QTBUG-26004
Change-Id: I59936d0f675b7f734e04b3f5e63631c74ca4f163
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>