profile/ivi/qtbase.git
11 years agoDelete codecs page
Lars Knoll [Mon, 26 Nov 2012 12:12:36 +0000 (13:12 +0100)]
Delete codecs page

Unused and empty. QTextCodec and the Unicode overview
contains all relevant information.

Change-Id: I779ba4dea69a88802e34541e4ba44215b5d69c2a
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agotst_QSharedPointer: update application types
J-P Nurmi [Mon, 26 Nov 2012 11:22:45 +0000 (12:22 +0100)]
tst_QSharedPointer: update application types

QCoreApplication::Type enum was removed in 553e21. This change updates
the (un)tested application types to match the application types
available in Qt 5.

Change-Id: I8631987a9ff31dc81baa013619cfc18616b851d1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agotst_QGridLayout: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 15:00:46 +0000 (16:00 +0100)]
tst_QGridLayout: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: If163aae6910c0b082a9bcca1ebbab66660cc005f
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agotst_QFormLayout: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 14:58:15 +0000 (15:58 +0100)]
tst_QFormLayout: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: Ie28d4ea074938b17827aa803a2298f881946f7e5
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agotst_QBoxLayout: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 14:56:13 +0000 (15:56 +0100)]
tst_QBoxLayout: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: I287c771a841ba96e445f0a0df96ea035be25ac74
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agotst_QMenuBar: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 14:54:19 +0000 (15:54 +0100)]
tst_QMenuBar: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: I422e7d67fadbb169d19285aab0a8ba0f3d668697
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agotst_QComboBox: use QProxyStyle instead of QWindowsStyle
J-P Nurmi [Fri, 23 Nov 2012 14:50:48 +0000 (15:50 +0100)]
tst_QComboBox: use QProxyStyle instead of QWindowsStyle

QWindowsStyle is soon to become an internal class.

Change-Id: Ic76ecc20ff600a7d401b44c8dc4d93198c06becc
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
11 years agoFix keyboard grab in QWidgetWindow.
Friedemann Kleint [Fri, 23 Nov 2012 16:26:25 +0000 (17:26 +0100)]
Fix keyboard grab in QWidgetWindow.

Task-number: QTBUG-28070
Change-Id: I6f55a2dd906ee896071137a5d47fb97c9a571b5f
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
11 years agofix wrong comment about #ifdef's end
Peter Kümmel [Thu, 22 Nov 2012 22:13:00 +0000 (23:13 +0100)]
fix wrong comment about #ifdef's end

Change-Id: I8a627c01ced1163e3ea72e9e2b1b55da04ca91b2
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoEnable module build with QT_NO_CODECS
Tasuku Suzuki [Thu, 22 Nov 2012 20:34:42 +0000 (05:34 +0900)]
Enable module build with QT_NO_CODECS

Change-Id: I27239384a7676a81495a9d3f7484975d2f277e8c
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoChange QTextLayout::textOption() to return a const reference instead
Andy Shaw [Sat, 24 Nov 2012 09:40:29 +0000 (10:40 +0100)]
Change QTextLayout::textOption() to return a const reference instead

By changing textOption() to return a const reference we will get a
performance increase when accessing this function internally.

Task-number: QTBUG-28193
Change-Id: I65b594d844ebaee6d72f4a95d11bd2c5e801fab4
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agomoc: Fix assertion in QVector::first()
Konstantin Ritt [Sun, 25 Nov 2012 03:54:45 +0000 (05:54 +0200)]
moc: Fix assertion in QVector::first()

introduced in aea68c93ae437a761584719f0f1ca93eaf6f7484

Change-Id: I05c1dfa16c42019ee0a0b44ffc50ad2c2c0d209b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix color issue with sliders on Fusion style
Jens Bache-Wiig [Sun, 25 Nov 2012 16:10:25 +0000 (08:10 -0800)]
Fix color issue with sliders on Fusion style

We should not directly use the palette as it looks
weird on mac.

Change-Id: I2062bd43a8b28875330d9f8cc0eaa4069f3a43f6
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoDoc: Removed annotated list in Qt Core's group pages.
Jerome Pasion [Fri, 23 Nov 2012 15:45:23 +0000 (16:45 +0100)]
Doc: Removed annotated list in Qt Core's group pages.

The annotatedlist commands are not needed as QDoc automatically
generates the group members.

Change-Id: I462bb65bd5f29c1761799d3d60acab0bd4886075
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoQHeaderView: - avoid cursor move on setDefaultSectionSize
Thorbjørn Lund Martsum [Thu, 22 Nov 2012 18:49:05 +0000 (19:49 +0100)]
QHeaderView: - avoid cursor move on setDefaultSectionSize

If we are reacting on the sectionResized signal and we call
setDefaultSectionSize we should ensure that we are not moving
the mouse-cursor.

This is an improvement of f8f6acb05ce9aa5fccc329bf5587adf14ed9a710

Change-Id: I1adee7821bc8fcc9633f692bfd515f2c458b12c8
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoImproved tri-state checkbox in Fusion style
Jens Bache-Wiig [Sun, 21 Oct 2012 17:12:20 +0000 (19:12 +0200)]
Improved tri-state checkbox in Fusion style

This changes the tristate checkbox to look more distinct from the
disabled checkbox.

Task-number: QTBUG-27661

Change-Id: If0921c91d27b62552cbcf86563eed1b75e800478
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
11 years agoUpdate XKB data generator to use correct QLocale names
Konstantin Ritt [Sat, 24 Nov 2012 04:53:34 +0000 (06:53 +0200)]
Update XKB data generator to use correct QLocale names

Change-Id: I55fd5f029d77950a9074d9c86a65499b48806ebe
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
11 years agoLocaleSelector: Replace hard-coded impl with an algorithmic one
Konstantin Ritt [Sat, 24 Nov 2012 03:20:39 +0000 (05:20 +0200)]
LocaleSelector: Replace hard-coded impl with an algorithmic one

The old implementation is just not acceptable!
The new one is able to distinguigh locales by script.

Change-Id: Ic772f6da8744825080f739e64af00267e5f82434
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
11 years agoQLocale: Fix matchingLocales() behavior if script or country is not Any*
Konstantin Ritt [Sat, 24 Nov 2012 02:09:34 +0000 (04:09 +0200)]
QLocale: Fix matchingLocales() behavior if script or country is not Any*

Since the documentation doesn't mention the search should be done by language only,
consider the current behavior incorrect.
As of now, it is possible to get a list of locales by Country or Script as well.

Also fix countriesForLanguage() to be in-sync with matchingLocales().

Change-Id: I6a09ca459120143565fa6099d2b823df1fed7c25
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
11 years agoQtBase: example code style
David Schulz [Fri, 23 Nov 2012 13:27:50 +0000 (14:27 +0100)]
QtBase: example code style

Change-Id: I0685f7e2c7c698a4bf288b8b1ae909167932a3fb
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoQtBase: examples/widgets/richtext code style
David Schulz [Fri, 23 Nov 2012 12:36:40 +0000 (13:36 +0100)]
QtBase: examples/widgets/richtext code style

Change-Id: Ie0c27464e0fdb8f26caf0d8f27043da4ec45f41f
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoFix QVariant streaming in Qt3 compatibility mode.
Jędrzej Nowacki [Wed, 21 Nov 2012 15:24:49 +0000 (16:24 +0100)]
Fix QVariant streaming in Qt3 compatibility mode.

Task-number: QTBUG-27700
Change-Id: I0408293e43c3330dbc4746198a19709e795f552a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agotst_QDateTimeEdit: remove redundant include
J-P Nurmi [Fri, 23 Nov 2012 14:27:32 +0000 (15:27 +0100)]
tst_QDateTimeEdit: remove redundant include

Change-Id: I3aeb90723b41b35e221b86b1767ed1ac45a9fe0c
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agotst_QToolButton: remove redundant include
J-P Nurmi [Fri, 23 Nov 2012 14:29:04 +0000 (15:29 +0100)]
tst_QToolButton: remove redundant include

Change-Id: Ie55a530a89b85a4f3369ee3205221fb01fa1773e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years ago[SIC] QLocale: Update some language names with their modern values
Konstantin Ritt [Fri, 23 Nov 2012 10:18:11 +0000 (12:18 +0200)]
[SIC] QLocale: Update some language names with their modern values

Some of them were incorrectly spelled (for a while)

Change-Id: I871968e3bbdd2172f4c4dfb6e74729c05e7e8e01
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoQLocale: Fix toCurrencyString() didn't respect group separator option
Konstantin Ritt [Fri, 23 Nov 2012 09:45:01 +0000 (11:45 +0200)]
QLocale: Fix toCurrencyString() didn't respect group separator option

Change-Id: Icda43d71d600d77fe1ed4fcde1ef4478ef29c1d5
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Denis Dzyubenko <denis@ddenis.info>
11 years agoCleanup tst_QApplication
J-P Nurmi [Fri, 23 Nov 2012 14:02:46 +0000 (15:02 +0100)]
Cleanup tst_QApplication

Remove redundant includes, remove references to deprecated
QApplication::GuiServer (passing that has no effect anymore), and use
QStyleFactory instead of referencing QWindowStyle directly (about to
become an internal class).

Change-Id: I08f94993a55ce6039c7694d8f7019cbd53594edc
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
11 years agoRemove QApplication::type() and make QCoreApplication::Type internal
J-P Nurmi [Thu, 22 Nov 2012 13:29:07 +0000 (14:29 +0100)]
Remove QApplication::type() and make QCoreApplication::Type internal

These Qt3 legacy application types do not match the application types
available in Qt5. Thus, the decision was to kill the confusing and
mostly useless type enum. Use for example qobject_cast instead to find
out the application type.

Task-number: QTBUG-28093
Change-Id: Ia8cf7c3ea98a3cea27f74760d62e519ea10bce9f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoMake skipping of test consistent.
Frederik Gladhorn [Fri, 23 Nov 2012 16:39:23 +0000 (17:39 +0100)]
Make skipping of test consistent.

On Mac every function was skipped individually,
on the other platforms it was marked as
insignificant.

See also QTBUG-22560 and QTBUG-22361

Change-Id: Ie9b9c617006d5a8c19d042b8be89e449c5ac70bc
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoDraw disabled QMenu items in inactive state in vista style.
Friedemann Kleint [Fri, 23 Nov 2012 14:18:50 +0000 (15:18 +0100)]
Draw disabled QMenu items in inactive state in vista style.

Task-number: QTBUG-27992

Change-Id: I4ed5661cfe0d0a10143224b73fbad6fac4927a37
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoUpdated aboutQt dialog text
Lars Knoll [Fri, 23 Nov 2012 13:48:04 +0000 (14:48 +0100)]
Updated aboutQt dialog text

Updated supported platforms to match reality better,
mention qt-project.org and other copyright holders.

Task-number: QTBUG-25205
Change-Id: I4856d515500945ace55f7fd445b5b138aa00df83
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoRemove Plastique and Cleanlooks from the widget gallery
Jan Arve Saether [Fri, 23 Nov 2012 15:10:17 +0000 (16:10 +0100)]
Remove Plastique and Cleanlooks from the widget gallery

This commit does not remove the actual images, since they
are referenced from many other places.

Plastique style seems to have been used often as a style
for showing a screenshot of a widget (probably because it
has been available on all platforms).

When fusion style gets its gallery with images, the references
to the plastique images should probably be replaced with
references to fusion images.

Change-Id: I288c06df2c5e1f3a212b873ec0f087e119b895b0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoDoc: Be consistent, and put all widget classes in the same page.
Jan Arve Saether [Fri, 23 Nov 2012 08:58:30 +0000 (09:58 +0100)]
Doc: Be consistent, and put all widget classes in the same page.

Change-Id: I152a39e798a152b5362db7fdc63ccd6b887ee13b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoFix outdated comment in kernel/qtranslator_p.h.
hjk [Fri, 23 Nov 2012 07:12:22 +0000 (08:12 +0100)]
Fix outdated comment in kernel/qtranslator_p.h.

Change-Id: I0e7cc1686c5bcce611e353987e41b4dae7af5c31
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agodocs: DBus: Remove ObjectTree
Frederik Gladhorn [Fri, 23 Nov 2012 15:07:29 +0000 (16:07 +0100)]
docs: DBus: Remove ObjectTree

In 0696071316b3dacb8d1ca15a269e4f4215642b9d
the ObjectTree class was removed.

Change-Id: I9c7a505a597e7c2ed9243468faee931a481b1b22
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agodocs: Remove doc for removed functions
Frederik Gladhorn [Fri, 23 Nov 2012 14:27:52 +0000 (15:27 +0100)]
docs: Remove doc for removed functions

In 3986b5127419dfd6db6ce667b2976d188e25d9be
these two functions were removed.

Change-Id: Ib38692099aee8f71a8ae0f7949b8fa90eddf6009
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agodocs: Link to class overview for dbus
Frederik Gladhorn [Thu, 22 Nov 2012 14:52:22 +0000 (15:52 +0100)]
docs: Link to class overview for dbus

Change-Id: I15b3791861e393065817054965aec5c0a5ae4c7b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
11 years agoFix selection in QTableView when rows and columns have been moved
Miikka Heikkinen [Thu, 15 Nov 2012 11:08:12 +0000 (13:08 +0200)]
Fix selection in QTableView when rows and columns have been moved

The determination of top left and bottom right model indexes for the
selection used logical indexes, which resulted in selection truncating
itself if the first or last row or column had been moved to different
position on the table. Changed the logic to use visual indexes instead.

Task-number: QTBUG-28009
Change-Id: I4eb9dab690dafda9d2ab7c452dd6271fad70cb30
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoAdded reference to W3C's XML specs
Nico Vertriest [Wed, 21 Nov 2012 14:34:13 +0000 (15:34 +0100)]
Added reference to W3C's XML specs

Removed 's from title

Change-Id: I7c44279aab02edd26e454da5f59f4a9a19eab18a
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoPrevent "number of sections exceeded" when compiling qmetatype tests.
Mitch Curtis [Thu, 22 Nov 2012 11:45:30 +0000 (12:45 +0100)]
Prevent "number of sections exceeded" when compiling qmetatype tests.

When compiling qmetatype auto tests with msvc2008 64-bit, I receive:

qmetatype.h(383) : fatal error C1128: number of sections exceeded
object file format limit : compile with /bigobj

This patch follows that advice and adds /bigobj to QMAKE_CXXFLAGS.

Change-Id: I05b3cf9dfdb6a93649c692e2df22365d200e6f2f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoFixed excessive enter/leave events being generated with the xcb plugin.
Samuel Rødal [Fri, 23 Nov 2012 14:10:39 +0000 (15:10 +0100)]
Fixed excessive enter/leave events being generated with the xcb plugin.

When we get a leave event we peek ahead in the queue to see if there's
an enter event already pending. If so we use
QWindowSystemInterface::handleEnterLeave() instead of two separate
window system interface events, so that you don't get leave and enter
events for the whole parent chain when moving the mouse cursor between
two neighbouring native child widgets.

We skip VIRTUAL events as they are generated for parent windows, and we
only care about the bottom-most window that is being entered / left. Qt
can take care of the rest since it knows the QWindow hierarchy.

We need to not skip leave events with detail set to INFERIOR, since Qt
expects to get a handleEnterLeave() when the mouse moves from a parent
window to a child window.

Task-number: QTBUG-27550
Change-Id: I7457d2e59d8b694081f2e43a16cd2e58d769624e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoDo not detect directories ending in ".lnk" as link files.
Friedemann Kleint [Fri, 23 Nov 2012 13:54:18 +0000 (14:54 +0100)]
Do not detect directories ending in ".lnk" as link files.

Task-number: QTBUG-21863

Change-Id: I70b661fa5fcaba1293a80c971c506798826f5b23
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoProper macro replacment and branch evaluation
Lars Knoll [Thu, 22 Nov 2012 10:03:39 +0000 (11:03 +0100)]
Proper macro replacment and branch evaluation

Correclty replace macros according to the C++ standard.
Use the correct replacement method also to evaluate

With this moc correctly processes boost headers.

Task-number: QTBUG-27546

Change-Id: I001b3054c5fcdc34d46cfa53d1387bd19436f361
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoCorrectly expand arguments in function macros
Lars Knoll [Thu, 22 Nov 2012 09:31:14 +0000 (10:31 +0100)]
Correctly expand arguments in function macros

Arguments in function macros are only expanded if they
aren't used in conjunction with a # or ## operator.

Change-Id: I8c80e11902a592128504c4637545e75866566965
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoRemove additional whitespaces from the macro tokens
Lars Knoll [Thu, 22 Nov 2012 08:13:14 +0000 (09:13 +0100)]
Remove additional whitespaces from the macro tokens

According to the spec, we should ignore whitespace tokens
at the beginning and end of the macro definition. In addition,
whitespaces after a # and around ## should be ignored

Change-Id: I830d0f4aaed3bcfac345d7da6df65693ec3315b8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoEmit destroyed() signal before children get deleted
Lars Knoll [Tue, 20 Nov 2012 12:34:06 +0000 (13:34 +0100)]
Emit destroyed() signal before children get deleted

Make sure we always emit the destroyed() signal before
we delete our children. This wasn't working correctly
for QWidget based classes, as the QWidget destructor
deletes all children itself.

Task-number: QTBUG-24672
Change-Id: Iecdff3489196271177edfeba1c4a2c5800e255af
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoAdd VS manifest files to .gitignore
J-P Nurmi [Fri, 23 Nov 2012 12:24:46 +0000 (13:24 +0100)]
Add VS manifest files to .gitignore

Change-Id: I3aea869d870bdba047b4e86d2034c25eb62075f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoCleanup Symbian specific rules from .gitignore
J-P Nurmi [Fri, 23 Nov 2012 12:21:00 +0000 (13:21 +0100)]
Cleanup Symbian specific rules from .gitignore

Change-Id: I0a47ae19d327af54e54cca94a04d90b543855988
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoFix \brief for QEasingCurve
Lars Knoll [Fri, 23 Nov 2012 13:25:23 +0000 (14:25 +0100)]
Fix \brief for QEasingCurve

Change-Id: Ibb8ce4e87e6338cc9d436344d1336397db093cb0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoQHeaderView - Fix auto-scroll on manual move on sections
Thorbjørn Lund Martsum [Wed, 31 Oct 2012 15:01:53 +0000 (16:01 +0100)]
QHeaderView - Fix auto-scroll on manual move on sections

This patch fixes the manual move of sections when auto scroll is on.
It is done in QAbstractItemView::doAutoScroll by letting the
qheaderView use its parents scrollbars if they are childs of a
QTableView or QTreeView.

Task-number: QTBUG-993
Task-number: QTBUG-1103

Change-Id: I70d999d9a07c3566e42d01cc5ebb47a69a83d9d4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoQAbstractItemView - prepare fix for auto scroll on sectionmove
Thorbjørn Lund Martsum [Wed, 31 Oct 2012 14:07:40 +0000 (15:07 +0100)]
QAbstractItemView - prepare fix for auto scroll on sectionmove

There are no semantic changes in this patch. We just avoid
many calls to horizontalScrollBar() and verticalScrollBar() by
storing the result of them in local variables, that are used
instead.

This is just a prepare for auto-scroll when a user is moving a
section.

Change-Id: I4b3d3ecbf3a29992e6f578d4b0442d7f494125e4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoPrevent easing example warnings.
Thomas Hartmann [Wed, 21 Nov 2012 10:53:45 +0000 (11:53 +0100)]
Prevent easing example warnings.

examples/widgets/animation/easing was spitting out a lot of
"QEasingCurve: Invalid tcb curve" warnings.
The reason was that in case of the TCP curve we do not provide
defaults.

The function createEasingCurve() now provides reasonable values
for the custom curves to show what is possible and how to use them.

Change-Id: I880d8d0f0ce2872ce2019f7d2e000f4c4ce136e2
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
11 years agoCocoa: Make sure non windowed QCocoaWindows hide their content views
Gabriel de Dietrich [Thu, 22 Nov 2012 16:38:52 +0000 (17:38 +0100)]
Cocoa: Make sure non windowed QCocoaWindows hide their content views

Change-Id: I92b8600c513ba033c459b6911ca62fc31698dc4a
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoCocoa: Make sure child windows' QNSView is properly released
Gabriel de Dietrich [Wed, 21 Nov 2012 15:19:21 +0000 (16:19 +0100)]
Cocoa: Make sure child windows' QNSView is properly released

Child QCocoaWindows don't have an assigned NSWindow, but still get a
QNSView as backing store. That QNSView is added as a subview to
the parent window's QNSView. That would leave an unmanaged QNSView
alive.

Change-Id: I10f57fb971f7aa1e278bb0af4217052d1e4bb0bc
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoCocoa: QGLWidget draws wrong within QMainWindow on Mac OS
Richard Moe Gustavsen [Wed, 21 Nov 2012 12:57:00 +0000 (13:57 +0100)]
Cocoa: QGLWidget draws wrong within QMainWindow on Mac OS

The resons for this bug is that Qt can share the same backingstore
between several windows (if they exist in the same hierarchy), but
this was just not supported by the Cocoa plugin.

This patch will make sure that we pay attention to which window
the QCocoaBackingStore is told to flush, and forward this information
to the QNSView that backs it up. Inside the views drawRect
function we then take some extra steps to get the correct sub-part
of the possibly shared backingstore image.

This patch also does some effort to ensure that we recreate the
backingstore image as little as possible, as we can often get
several resizes to the backingstore before we actually draw anything.
Moreover, by being a bit careful on how we tell UiKit to update
the view upon a flush, we can minimize the number of drawRect calls
(and then CGImageRef creations) we need to do. This patch actually
ends up improving resize/repaint performance a lot as well.

QT-BUG: 27390
Change-Id: I2c2a26b149fa855411b6bff8b9cc9a61694ae72f
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agoMake widgetgrab manual test compile with 4.8 and 5.
Friedemann Kleint [Fri, 23 Nov 2012 11:42:11 +0000 (12:42 +0100)]
Make widgetgrab manual test compile with 4.8 and 5.

Task-number: QTBUG-27333
Task-number: QTBUG-27550

Change-Id: Iceb2ded9deff1d375bf02b88e214da20901bfa0e
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
11 years agoQtBase: examples/widgets/graphicsview/ codestyle
David Schulz [Fri, 23 Nov 2012 08:31:03 +0000 (09:31 +0100)]
QtBase: examples/widgets/graphicsview/ codestyle

Change-Id: I501066b5eb5a1557d510e0ec20b5270e8c12704a
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoQtBase: examples/widgets/painting code style
David Schulz [Fri, 23 Nov 2012 10:52:51 +0000 (11:52 +0100)]
QtBase: examples/widgets/painting code style

Change-Id: I3d3c6f3bae20ac8383279437f8f89c92195a704f
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoAdd nsOpenGLContextForContext to QCocoaNativeInterface.
Zeno Albisser [Fri, 23 Nov 2012 09:52:22 +0000 (10:52 +0100)]
Add nsOpenGLContextForContext to QCocoaNativeInterface.

This change enables receiving the native NSOpenGLContext that is used
by a QOpenGLContext. This clearly is non-public api that is only meant to
be used as a last resort for cases where it is really necessary to
get hold of a native context object.

Change-Id: Iea7c6abb458acc7aa15926052673270d25d1d9d1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoFix race condition on d->state, by locking the mutex first.
David Faure [Tue, 23 Oct 2012 20:25:10 +0000 (22:25 +0200)]
Fix race condition on d->state, by locking the mutex first.

Detected by helgrind ./tst_qurl testThreads

Change-Id: I0fe01153cd119741ce8a2bfe7dddead7c6ebf0b0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agoMade QMacStyle internal
J-P Nurmi [Fri, 16 Nov 2012 23:52:26 +0000 (00:52 +0100)]
Made QMacStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QMacStyle directly.

Change-Id: I44a2f5ee3fe08ecc837b593a2a2737eb90e8c267
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agotst_qlistview: remove redundant include
J-P Nurmi [Fri, 23 Nov 2012 13:54:26 +0000 (14:54 +0100)]
tst_qlistview: remove redundant include

Change-Id: If33518159feb202fa041ac2809817dff5616249f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agotst_qwizard: remove redundant include
J-P Nurmi [Fri, 23 Nov 2012 13:51:26 +0000 (14:51 +0100)]
tst_qwizard: remove redundant include

Change-Id: I837aed1e5e601e67105562df2764327b7e8c44a6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
11 years agoxcb plugin: Move the include XInput2.h statements
Thomas Senyk [Thu, 22 Nov 2012 17:11:56 +0000 (18:11 +0100)]
xcb plugin: Move the include XInput2.h statements

If the include of egl.h does nasty things with X11-defines
(this happens with the imx6 gpu-drivers) errors are avoided if
the include of XInput2.h is next to the other X-includes,
and not after include of egl.h

Change-Id: I182d0e1fcf3fa3e6abce880d34e63cc1d2ce8ed4
Reviewed-by: Laszlo Agocs <lagocs83@gmail.com>
11 years agoQTBF: Fix issue with no splitting the words at "." (FULL STOP)
Konstantin Ritt [Thu, 22 Nov 2012 01:25:05 +0000 (03:25 +0200)]
QTBF: Fix issue with no splitting the words at "." (FULL STOP)

As of Unicode 5.1, some punctuation marks were mapped to MidLetter and MidNumLet
for better URL and abbreviations handling which caused "hi.there" to be treated
like if it were just a single word;
until we have the Unicode Text Segmentation tailoring mechanism, retain
the old behavior by remapping (some of) those characters back to their old values.

Change-Id: I49dea6064f2ea40a82fc0b1bc3c4f0b4e803919f
Reviewed-by: David Faure <david.faure@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoBlackBerry mkspecs: tell compiler the specific ARM version (cortex-a9)
Peter Hartmann [Thu, 22 Nov 2012 16:29:04 +0000 (17:29 +0100)]
BlackBerry mkspecs: tell compiler the specific ARM version (cortex-a9)

... so the compiler knows which instructions to generate and can
optimize for the specific CPU.
All BlackBerry platforms are Cortex-A9 compatible.

Change-Id: I3fd22e63af12f704365f494bbb7138963b4c4ec7
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoMake QtQuick documentation references work
Paul Olav Tvete [Thu, 22 Nov 2012 15:57:07 +0000 (16:57 +0100)]
Make QtQuick documentation references work

...and add one where we used to say that QWidget is "the base
class of everything that appears on the screen".

Change-Id: I573d8162fd69b7bfc5b0305f3ed6530129386b78
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoMac: Fix compilation with -sdk option
Eike Ziller [Wed, 31 Oct 2012 09:50:43 +0000 (10:50 +0100)]
Mac: Fix compilation with -sdk option

The include paths that the mkspecs set into the OpenGL/AGL frameworks
must take the SDK into account.
(The headers in 10.8 have slightly changed wrt 10.7, leading to compile
errors because framework style includes (<OpenGL/foo.h>) within the system
headers are resolved to the SDK framework headers.)

Change-Id: I6113cdb95b462d587f593682e03e81e920f3f672
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
11 years agoAdd pointers to the rich text documentation from mentions of rich text.
Samuel Rødal [Thu, 22 Nov 2012 11:04:40 +0000 (12:04 +0100)]
Add pointers to the rich text documentation from mentions of rich text.

The QLabel documentation for instance is quite confusing since it talks
about rich text without saying what it actually is. The QTextEdit
documentation can also be improved by being more explicit.

Change-Id: Ie718d170e18a0b713fe567fb707330d0085fb9e4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoCocoa: Fix disabled colors in palette
Gabriel de Dietrich [Thu, 22 Nov 2012 13:14:47 +0000 (14:14 +0100)]
Cocoa: Fix disabled colors in palette

Change-Id: I1e6cf2a860f611e08ae2720c2e4eed65a85dbe9c
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
11 years agodefault to Regular font with FontConfig
Michał Sawicz [Mon, 19 Nov 2012 14:38:03 +0000 (15:38 +0100)]
default to Regular font with FontConfig

Default to Regular/Normal instead of Medium in QFontConfigDatabase.

Requesting Medium as default was fine until the font actually provided a
Medium font, at which point it was selected by default.

Tweak the buckets so that Medium has preference over Bold when DemiBold
is requested. They will have to be extended for Medium when QTBUG-25814
is resolved.

Change-Id: I111b7f99083d50c3e8264f84f10a997f619ef4b3
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoRevise QObject::connect documentation.
Mitch Curtis [Mon, 19 Nov 2012 08:58:24 +0000 (09:58 +0100)]
Revise QObject::connect documentation.

Change-Id: I07d593b6b2c3d5c8843212d5a888525ac29ca1b0
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoImproved the paint devices and backends documentation page.
Samuel Rødal [Thu, 22 Nov 2012 08:47:21 +0000 (09:47 +0100)]
Improved the paint devices and backends documentation page.

The image was outdated and didn't really add much information.

Also bring back mention of QWidget here.

Change-Id: I9de95a4ae7eaf0352418bea5732b5e9a763c73c2
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoFixed misspelled dependency in qtgui.qdocconf to fix QtQuick doc links.
Samuel Rødal [Thu, 22 Nov 2012 15:12:33 +0000 (16:12 +0100)]
Fixed misspelled dependency in qtgui.qdocconf to fix QtQuick doc links.

Change-Id: Ia481d0eb643bafd03a353c7a4f40f130607ced29
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
11 years agoQWidgetPrivate::init(): clarify that QWidget requires QApplication
J-P Nurmi [Thu, 22 Nov 2012 11:54:51 +0000 (12:54 +0100)]
QWidgetPrivate::init(): clarify that QWidget requires QApplication

Task-number: QTBUG-28076
Change-Id: Ica9713894c18bb43ae817a6dd42be087b23fa8c2
Reviewed-by: Jing Bai <jing.bai@digia.com>
11 years agoqmake: do not exclusively lock files for reading on Windows/MSVC
Joerg Bornemann [Thu, 22 Nov 2012 10:59:11 +0000 (11:59 +0100)]
qmake: do not exclusively lock files for reading on Windows/MSVC

When sifting through a file to find Q_OBJECT and friends, qmake
was locking it for reading and writing (_SH_DENYRW).
This breaks parallel builds where multiple qmake instances might want
to scan the same file.
Changed the sharing constant to _SH_DENYNO, which doesn't lock the
file at all. This is consistent with the _sopen_s call in findDeps.

Change-Id: I9c0a06db7f580f411e79d9d96dd36a6d705679aa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
11 years agoqdoc: fix urls in manifests after modularization
hjk [Thu, 22 Nov 2012 13:53:18 +0000 (14:53 +0100)]
qdoc: fix urls in manifests after modularization

Change-Id: Ib01062f29139f670894f5496d67ccdfe622b778b
Reviewed-by: Martin Smith <martin.smith@digia.com>
11 years agoMade QWindowsMobileStyle internal
J-P Nurmi [Tue, 20 Nov 2012 12:50:40 +0000 (13:50 +0100)]
Made QWindowsMobileStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QWindowsMobileStyle directly.

Change-Id: Id64f3dabff38db7864e235c79b2e9276379f4ba4
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agoMade QWindowsCEStyle internal
J-P Nurmi [Tue, 20 Nov 2012 12:41:59 +0000 (13:41 +0100)]
Made QWindowsCEStyle internal

We will take this opportynity to remove various QStyle specializations
from the public API in Qt5. This gives us much more freedom, for
example changing the inheritance hierarchy, pluginizing etc. without
worrying about BC.

=> Use QStyleFactory and/or QProxyStyle instead of creating an instance
or inheriting QWindowsCEStyle directly.

Change-Id: I6b3c0554e7a2a4a5f0027f4ea1342fd332af89ad
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
11 years agoFix transformed text on Mac OS X
Eskil Abrahamsen Blomfeldt [Wed, 21 Nov 2012 08:58:12 +0000 (09:58 +0100)]
Fix transformed text on Mac OS X

In change 1582407fc782c0befd0760633324dd5c206524a1, the Q_WS_MAC
code path which disabled drawing cached glyphs for any transform
was removed, as was the comment that scaling and rotation wasn't
supported by the Mac font engines. This obviously broke transformed
text on Mac, so we need to put it back.

I put it into the font engine itself where it belongs, and I kept
the somewhat confusing naming convention which is used in the
paint engine to minimize this patch. I'll clean up these function
names in a future commit.

Task-number: QTBUG-27362
Change-Id: I4fc6a503eedd4b1ebaf3ee659d948f997f433338
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoFixes problem with single precision floats in QDataStream (Windows).
Christian Strømme [Tue, 13 Nov 2012 18:17:17 +0000 (19:17 +0100)]
Fixes problem with single precision floats in QDataStream (Windows).

When the floating-point behavior in MSVC is set to "precise" (default),
assigning nan numbers to a float causes the bit pattern to be altered
(only affects 32bit builds). We should therefore not assign the swapped
value back to a float and use it.

Task-number: QTBUG-25950

Change-Id: I7b6cc4d546e5c8aeafdede749056358b7d639ec7
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
11 years agoAdd WindowFullscreenButtonHint.
Morten Johan Sørvig [Mon, 5 Nov 2012 21:20:47 +0000 (22:20 +0100)]
Add WindowFullscreenButtonHint.

Adds the fullscreen button on Mac OS X. Has no effect
on other platforms. Regarding the name I dropped the
"Mac" prefix (like MacWindowToolBarButtonHint). Other
platforms can use and we don't want to accumulate "Mac"
API's.

Change logic in QCocoaWindow check for this flag instead
of using WindowsMaximizebutton.

Change-Id: I9f2db75e8e71b3da36777c7e48852eda3ce9d534
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
11 years agoAccessibility Mac: Return textArea as role for multi line text.
Frederik Gladhorn [Thu, 15 Nov 2012 16:01:15 +0000 (17:01 +0100)]
Accessibility Mac: Return textArea as role for multi line text.

Change-Id: I88eb4746463b7372c2dfe089ba74ea4cb0098396
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoAccessibility: set multiline state for text edits.
Frederik Gladhorn [Thu, 15 Nov 2012 16:06:50 +0000 (17:06 +0100)]
Accessibility: set multiline state for text edits.

Change-Id: I22d3baac8fc57db0c89d8543019a93263b2023ca
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
11 years agoAccount for the item spacing when using QListView::scrollTo()
Pierre Rossi [Mon, 19 Nov 2012 20:15:19 +0000 (21:15 +0100)]
Account for the item spacing when using QListView::scrollTo()

Somehow this bug managed to stay hidden until the introduction
of QFusionStyle.

Task-number: QTBUG-27675
Change-Id: I86b049b869e9f2951426dc67a485ad7c60ef1403
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
11 years agoReturn something from QPAEventDispatcherGlib::processEvents
hjk [Thu, 22 Nov 2012 08:33:33 +0000 (09:33 +0100)]
Return something from QPAEventDispatcherGlib::processEvents

Change-Id: I0abaf73d4b6b96dbcf499ea86749ced76348c281
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
11 years agoGet rid of deprecated functionality in QtOpenGL.
Samuel Rødal [Thu, 22 Nov 2012 07:35:48 +0000 (08:35 +0100)]
Get rid of deprecated functionality in QtOpenGL.

We will in any case not be able to support this in Qt 5, so best to just
remove it to not give any false impressions.

Change-Id: Ib52e86007b9e6483bd973f13502b078792a9fa40
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoFix drops from external sources.
Gatis Paeglis [Thu, 11 Oct 2012 13:29:40 +0000 (15:29 +0200)]
Fix drops from external sources.

Task-number: QTBUG-26832

Change-Id: Ia1ccce391178e73d26a4f09955bce6c37616384f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoPass extended key event infomation in xcb platform.
Weng Xuetian [Sun, 24 Jun 2012 05:04:44 +0000 (13:04 +0800)]
Pass extended key event infomation in xcb platform.

Bare QKeyEvent missing some useful info for input method.
Use new construct of QKeyEvent to create extended QKeyEvent

Change-Id: I8c89e80e7329b92e3e04d5fe52d07c6f6f9e006f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoQtPrintSupport: use CUPS defaults for UNIX print dialog
Teemu Katajisto [Wed, 22 Aug 2012 09:09:21 +0000 (12:09 +0300)]
QtPrintSupport: use CUPS defaults for UNIX print dialog

Update printer defaults in UNIX print dialog when printer
is changed.

Task-number: QTBUG-23037
Task-number: QTBUG-6239
Task-number: QTBUG-15351
Task-number: QTBUG-19233
Task-number: QTBUG-22036

Change-Id: Ib03635035211bd69b5b23da20ffd2c03ac318a1a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
11 years agoQtPrintSupport: remove advanced tab from UNIX print properties dialog
Teemu Katajisto [Mon, 13 Aug 2012 08:47:32 +0000 (11:47 +0300)]
QtPrintSupport: remove advanced tab from UNIX print properties dialog

The Advanced tab shows CUPS options and duplicates some of the settings
in Page tab. These duplicate settings cannot be kept in synchronization
and thus the Advanced tab causes confusion which settings are used.

Remove the Advanced tab because the same settings are either available
in Page tab or can be configured in system printer settings.

Change-Id: I2dc2bf8b3b84dd19f24b2e6c1c9539c925d5d725
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
11 years agoCocoa: Properly set QNSView's geometry when it's a subview
Gabriel de Dietrich [Thu, 22 Nov 2012 14:56:48 +0000 (15:56 +0100)]
Cocoa: Properly set QNSView's geometry when it's a subview

Task-number: QTBUG-26960
Change-Id: Ib8ca76572c868305f378d22c21d13511b4999244
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
11 years agotst_QMetaProperty doesn't need QtGui
Marc Mutz [Thu, 22 Nov 2012 10:12:54 +0000 (11:12 +0100)]
tst_QMetaProperty doesn't need QtGui

Change-Id: Id286827f692b7c49436ae8247f49eff993a47bdc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agobootstrapped tools don't need env var setup
Oswald Buddenhagen [Thu, 22 Nov 2012 12:46:37 +0000 (13:46 +0100)]
bootstrapped tools don't need env var setup

Change-Id: I15d818d3ca24d426e492ea9d3a423f661b3ccf3b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
11 years agoDo not hide fullscreen widgets having a 0x0 geometry
Oliver Wolff [Thu, 22 Nov 2012 08:44:33 +0000 (09:44 +0100)]
Do not hide fullscreen widgets having a 0x0 geometry

It is possible that the widget which is to be shown full screen has a
0x0 geometry if an empty layout with 0 margin is set there. In that case
the widget should not be hidden.

Task-number: QTBUG-27602

Change-Id: I87fd20cc3a5bac89ceccdf639780c4bc721ce860
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
11 years agoMade renderText() work in samplebuffers example.
Samuel Rødal [Thu, 22 Nov 2012 08:12:54 +0000 (09:12 +0100)]
Made renderText() work in samplebuffers example.

Since the OpenGL paint engine is now OpenGL 2.0 based, we need to save
and restore all GL state to prevent it from being clobbered.

Task-number: QTBUG-27020
Change-Id: I39831e074aa818583df34c4a88b13be559d0231b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
11 years agoQtBase: examples/widgets/itemviews code style
David Schulz [Thu, 22 Nov 2012 12:40:51 +0000 (13:40 +0100)]
QtBase: examples/widgets/itemviews code style

Change-Id: I78a7745f7dc3add3fd7780220118d1b35b50a941
Reviewed-by: hjk <qthjk@ovi.com>
11 years agoDoc: Modified Qt Test's doc configuration to match file and dir names.
Jerome Pasion [Wed, 21 Nov 2012 12:03:05 +0000 (13:03 +0100)]
Doc: Modified Qt Test's doc configuration to match file and dir names.

-"qttestlib" should be the directory to match the name of the .index
file. The names affect the cross linking and the "depends" variable.

Change-Id: Ibd35e7a089c78c043527bd72741e57d72daa83d8
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
11 years agoAdd support for getaddrinfo using MinGW in tst_qhostinfo
Jonathan Liu [Wed, 21 Nov 2012 10:37:03 +0000 (21:37 +1100)]
Add support for getaddrinfo using MinGW in tst_qhostinfo

Change-Id: Ief9ddd22171ec2b852ca504957e0e11b90badccb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoQtBase: examples/widgets/itemviews/addressbook codestyle
David Schulz [Wed, 21 Nov 2012 14:45:13 +0000 (15:45 +0100)]
QtBase: examples/widgets/itemviews/addressbook codestyle

Change-Id: I710d67018351c34ef14ac30edcca81aba7ff5ad3
Reviewed-by: hjk <qthjk@ovi.com>