profile/ivi/qtbase.git
12 years agoDoc: Fix snippet and example referencing widget examples
Andy Nichols [Tue, 21 Aug 2012 14:13:49 +0000 (16:13 +0200)]
Doc: Fix snippet and example referencing widget examples

Widget examples were moved into a widgets subfolder, but
qdoc references were not updated.

Change-Id: Id2a4573e723745b9827c664c852807d6116f8f6d
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agotst_QMutex: add markers to the tryLock tests
Thiago Macieira [Wed, 22 Aug 2012 15:47:27 +0000 (17:47 +0200)]
tst_QMutex: add markers to the tryLock tests

Just to make it clear which two sections go together.

Change-Id: If3724d1c84172a61bdd7931cc567f4b7140d4f8a
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove remaining bits of deprecated QInputPanel
Pekka Vuorela [Tue, 21 Aug 2012 11:19:47 +0000 (14:19 +0300)]
Remove remaining bits of deprecated QInputPanel

Introduced during Qt5 development and renamed to QInputMethod.

Change-Id: If6744648dc98b779e65c449ae32626db574181df
Reviewed-by: Joona Petrell <joona.petrell@gmail.com>
12 years agoRemove unused inotify includes in the filesystem watcher test
Thomas McGuire [Wed, 15 Aug 2012 13:54:04 +0000 (15:54 +0200)]
Remove unused inotify includes in the filesystem watcher test

Change-Id: I346ef6ccf7b09390bef6d35c82ecee6dee1711fc
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoICU: Fix crash in codecForMib(2107)
Kai Koehne [Wed, 22 Aug 2012 11:51:45 +0000 (13:51 +0200)]
ICU: Fix crash in codecForMib(2107)

availableMibs() unconditionally adds 2107 to the list of mibs. The patch
ensures that codecForMib() also knows about this special TSCII codec.

(Note that the autotest only really checks this code path if only this
test case is run. The other tests already fill the internal codec cache
otherwise).

Change-Id: Id987d7cecd5f5700cca75e9b85b37011f8e5c622
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove qWaitForWindowShown(QWindow*) overload.
Stephen Kelly [Wed, 22 Aug 2012 09:24:15 +0000 (11:24 +0200)]
Remove qWaitForWindowShown(QWindow*) overload.

The QWindow* overload was introduced for Qt 5.0, but is unused already.

Change-Id: Ic07f19eac87bc93a589017407668760fceb2f632
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoA few more random documentation fixes
Shawn Rutledge [Wed, 15 Aug 2012 16:40:37 +0000 (18:40 +0200)]
A few more random documentation fixes

@p replaced by \a, \QD replaced by {Qt Designer}, couple of enums etc.

Change-Id: I315510690bf52e42db519292b4122fa24c73bbc9
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agotst_QTreeView: fix unused variable warning
Marc Mutz [Wed, 22 Aug 2012 10:04:56 +0000 (12:04 +0200)]
tst_QTreeView: fix unused variable warning

Change-Id: Idf18e4615754d3b7b8a09d6fdec91344a7408c18
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoDe-inline QVariant(float)
Harald Fernengel [Wed, 22 Aug 2012 11:34:21 +0000 (13:34 +0200)]
De-inline QVariant(float)

All QVariant constructors are not inline, so change QVariant(float) as
well. This allows for refactoring of QVariant during lifetime of Qt 5
without breaking QVariant(float) case.

Change-Id: Icd1fc331a1ef8a2872be811aa7d1160406038f06
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoFix bug in configure where Qt did not compile with QT_ICONV=no
Jan-Arve Saether [Tue, 21 Aug 2012 09:52:28 +0000 (11:52 +0200)]
Fix bug in configure where Qt did not compile with QT_ICONV=no

It did not compile because at the time qconfig.h was preprocessed,
QT_NO_ICONV was already defined, causing the #define QT_NO_ICONV to
fail. It should be guarded like most other defines in qconfig.h.
Also fix QT_CUPS=no, QT_ICONV=no, QT_GLIB=no, QT_NOTIFY=no and
QT_LARGEFILE_SUPPORT=64 the same way.

Change-Id: Ic9e0295756c35cb7c62e18eb9b63b1410e7de051
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMove Qt::CursorMoveStyle docs to the right file.
Frederik Gladhorn [Fri, 17 Aug 2012 13:10:01 +0000 (15:10 +0200)]
Move Qt::CursorMoveStyle docs to the right file.

Change-Id: I26cc7336b33495a2649285cfeddeadec62e94d83
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoFix accessibility unit test compilation
Pekka Vuorela [Tue, 21 Aug 2012 11:18:40 +0000 (14:18 +0300)]
Fix accessibility unit test compilation

Change-Id: I72c931e0704175b6b48d66a6df54784bcec6860c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoLogging: make qEmergencyOut() not allocate from the heap
Marc Mutz [Fri, 3 Aug 2012 07:32:05 +0000 (09:32 +0200)]
Logging: make qEmergencyOut() not allocate from the heap

Commit 6e6b74c0 introduced heap allocation in the form of
QString::fromLatin1().utf16() into qEmergencyOut(), a function
that's called in OOM situations and in cases where another
exception is still in flight.

Luckily, QString::fromLatin1().utf16() is just a funny way of
copying an array of chars into an array of wchar_ts, so we do
that manually now and use a static wchar_t buffer. While at it,
also throw text elision into the mix.

This commit also fixes the message passed to _CrtDbgReportW().
What should be displayed is the emergency_buf, not the format
string.

Also remove a similar allocation in qt_message_output().

Change-Id: I2c44a298fc0927bb992de4977a7e4a7b47b16b26
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoSimple optimisation in toLocal8Bit(): call codecForLocale once only
Thiago Macieira [Wed, 15 Aug 2012 16:15:06 +0000 (18:15 +0200)]
Simple optimisation in toLocal8Bit(): call codecForLocale once only

The function is only slow the first time we call it, but there's no
reason we can't do this simple optimisation anyway.

Change-Id: Icacbbeb340838b32f5278b76d1860ad22dc9f7b7
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix transformation in eglfs backingstore
Laszlo Agocs [Wed, 15 Aug 2012 15:17:38 +0000 (18:17 +0300)]
Fix transformation in eglfs backingstore

While not visible with forced-fullscreen windows, the formula
used to set up positioning on the Y axis is wrong. (with the GL
coordinate system Y goes 1..-1 when moving top-to-bottom)

Taken from kms' version of the backingstore which had the formulas
corrected.

Change-Id: I460a4eec925e47b08453af4e093d719567af22ea
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove deprecation from enumerations in QtGui.
Friedemann Kleint [Wed, 22 Aug 2012 06:31:57 +0000 (08:31 +0200)]
Remove deprecation from enumerations in QtGui.

Referencing them in a (deprecated) function declaration causes
a deprecation warning to be emitted each time the header is
included, which causes a massive amount of warnings for qevent.h.

It should be sufficient to deprecate them in the documentation
and to deprecate function using them.

Change-Id: I531b7c893e73428703cfb302615bff382abce54f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMove the QT_COMPILER_SUPPORTS_xxx defines to qconfig.h
Thiago Macieira [Sat, 11 Aug 2012 20:55:04 +0000 (22:55 +0200)]
Move the QT_COMPILER_SUPPORTS_xxx defines to qconfig.h

This reduces dramatically the command-line for compiling Qt sources.

These are private macros, only to be used by Qt's own modules, so the
compiler setting is either the same or, possibly, better. In other
words, in the worst case, when compiling a module with a better
compiler than for qtbase, such module might not enable all the
functionality it could otherwise do.

If we switch to a buildsystem that can support this properly in the
future, these macros should be removed.

Change-Id: I71f2d12ec98c9dd40eaab9de4a17446bd1066020
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agotst_QColumnView: fix unused variable warning
Marc Mutz [Wed, 22 Aug 2012 10:04:44 +0000 (12:04 +0200)]
tst_QColumnView: fix unused variable warning

Change-Id: I41a71faa64a20cebab058cf69181104eceea2339
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoOptimize QAbstractItemModel::sibling a bit.
Stephen Kelly [Wed, 22 Aug 2012 14:11:20 +0000 (16:11 +0200)]
Optimize QAbstractItemModel::sibling a bit.

QModelIndex::sibling has a simliar optimization.

Change-Id: Ic0717d480ba0d46a4c0c88064bc9eda4c4ffe6f6
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoqmake: fix embedding of generated manifests in debug mode
Joerg Bornemann [Wed, 22 Aug 2012 14:51:30 +0000 (16:51 +0200)]
qmake: fix embedding of generated manifests in debug mode

The existence of the manifest backup is used as a marker to decide
whether to embed the manifest in a second link step or not.
If it's present, the embedding took place in the first link step.
If it's not present, we must link again incrementally.
That logic was implemented faulty.

Change-Id: I10154dbbbe70c7981795ac66d46a166907ba13ec
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMake keyboard search work in the current column, not only the first.
Stephen Kelly [Wed, 22 Aug 2012 14:18:11 +0000 (16:18 +0200)]
Make keyboard search work in the current column, not only the first.

Task-number: QTBUG-26540
Change-Id: I1c365aeb013f5ddedd0589aa4c4844be759a3882
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoFix indexAbove and indexBelow to return indexes in the correct column.
Stephen Kelly [Wed, 22 Aug 2012 14:10:01 +0000 (16:10 +0200)]
Fix indexAbove and indexBelow to return indexes in the correct column.

They used to always return indexes in column 0.

Change-Id: I2cf4239e0a975b37548de00a1deb916fcd88b4c7
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoAdd -pipe option of win32-g++'s QMAKE_CFLAGS
Yuchen Deng [Sun, 19 Aug 2012 07:38:44 +0000 (15:38 +0800)]
Add -pipe option of win32-g++'s QMAKE_CFLAGS

Change-Id: Iad155d6340666283a31f82f8c7381f23018f7e40
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agomake configure set up QMAKE_DEFAULT_{INC,LIB}DIRS
Oswald Buddenhagen [Tue, 14 Aug 2012 20:09:33 +0000 (22:09 +0200)]
make configure set up QMAKE_DEFAULT_{INC,LIB}DIRS

hard-coding it in unix.conf was no particularly good idea for hopefully
obvious reasons.

the windows version is so far just a stub that does what the makespecs
hard-coded - more doesn't seem worth the effort. the guys interested in
x-building may want to rectify it at some point, but it's not going to
be easy.

Change-Id: I8fedd841a8416f8c0c57018752eae9510b5d00d0
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoqmake: fix generated rc file for embedding manifests
Joerg Bornemann [Wed, 22 Aug 2012 14:51:09 +0000 (16:51 +0200)]
qmake: fix generated rc file for embedding manifests

The rc file is in the same directory as the manifest file.
Therefore the include must consist of the filename and must not include
the file's path.

Change-Id: I4f5ac11b131f39ea8c425aca93fcf82d150c0204
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoClean up borders in cleanlooks
Jens Bache-Wiig [Tue, 21 Aug 2012 16:19:36 +0000 (18:19 +0200)]
Clean up borders in cleanlooks

This aligns the dockwidget appearance in cleanlooks with
that we use for Gtk style. It should look a lot cleaner this
way as most of the borders were redundant.

Change-Id: Idf20a105f583ca8cdbba0bcb6f22b298d53cc40d
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
12 years agoDoc: Fix snippet bug in State Machine overview.
Geir Vattekar [Tue, 21 Aug 2012 13:15:07 +0000 (15:15 +0200)]
Doc: Fix snippet bug in State Machine overview.

Task-number: QTBUG-24719
Change-Id: Ia0c802f275eaf009e42ffef4cc538f3b3d7561d0
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoFixed non-GL applications crashing when GLX/EGL initialization fails on xcb.
Samuel Rødal [Tue, 21 Aug 2012 15:36:03 +0000 (17:36 +0200)]
Fixed non-GL applications crashing when GLX/EGL initialization fails on xcb.

Change-Id: I5a08d6067272575aa56074aaebe308c3d49299bb
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDoc: change \menu to \uicontrol in application example docs
Andy Nichols [Tue, 21 Aug 2012 14:30:52 +0000 (16:30 +0200)]
Doc: change \menu to \uicontrol in application example docs

\menu command has been replaced by \uicontrol in qdoc

Change-Id: Ib105df58c565c96b34579720acb62fe64e7806c4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoremove a '.' at the end of \sa that confuses qdoc
Jeremy Katz [Tue, 21 Aug 2012 14:48:36 +0000 (16:48 +0200)]
remove a '.' at the end of \sa that confuses qdoc

Change-Id: I74532ba206a7e869328541599d5f184f18c224f1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoDoc: Really minor typo fix
Sergio Ahumada [Tue, 21 Aug 2012 16:36:26 +0000 (18:36 +0200)]
Doc: Really minor typo fix

Task-number: QTBUG-26891
Change-Id: I9b726d8766337fbb001afcb9ecbc45f51b6e363f
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoMake Qt compile with -DQDND_DEBUG and fix debug messages
Berthold Krevert [Wed, 8 Aug 2012 16:38:37 +0000 (18:38 +0200)]
Make Qt compile with -DQDND_DEBUG and fix debug messages

Change-Id: Idf34880179e27cdd48ea3365108d2c7bca07e596
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix minor typo in cmake files.
Stephen Kelly [Tue, 21 Aug 2012 11:27:21 +0000 (13:27 +0200)]
Fix minor typo in cmake files.

LIB_LOCATION is a cmake variable, not a qmake variable.

Change-Id: I1ec2feaca0c52400bd21dec371c9170dc95227b1
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoOnly set the IMPLIB target properties on Windows.
Stephen Kelly [Tue, 21 Aug 2012 10:18:30 +0000 (12:18 +0200)]
Only set the IMPLIB target properties on Windows.

Change-Id: I5362ae87c90fe08460599602b54484b6d4491db8
Reviewed-by: Clinton Stimpson <clinton@elemtech.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoAdd hint for touch -> mouse event synthesizing
Morten Johan Sorvig [Wed, 8 Aug 2012 09:44:39 +0000 (11:44 +0200)]
Add hint for touch -> mouse event synthesizing

Commit 7808ec79 changes QApplication to synthesize
mouse events from (unhandled) touch events.

On Mac OS X this creates a conflict for two-finger
scroll swipes, which generates both touch events and
mouse wheel events: scrolling in QTextEdit will also
select the text.

Add a SynthesizeMouseFromTouchEvents platform style
hint that enables the event synthesising. Set to true
by default and false in Cocoa.

Change-Id: I1ffa5a141476aa38b81ce92a87eff676c7ec2276
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoDo not consider sign in qIsNull.
Mitch Curtis [Wed, 1 Aug 2012 14:02:10 +0000 (16:02 +0200)]
Do not consider sign in qIsNull.

The current implementation of qIsNull only returns true if the value is
positive zero. This behaviour is not useful for use cases like
QPointF::isNull, where QPointF(-0, -0).isNull() will return false.
There doesn't seem to be a reason why the function exhibits this
behaviour (-0.0 is not accounted for in the unit tests), and for the
case of QSizeF::scale it causes a bug: qIsNull is used to check for
division by 0.0 before it proceeds, which fails in the case of -0.0.

Task-number: QTBUG-7303
Change-Id: I767e5280bd26614e8e78ae62b274eb9bc4ade385
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoRemove icons from buttons with Cleanlooks
Jens Bache-Wiig [Tue, 21 Aug 2012 15:26:42 +0000 (17:26 +0200)]
Remove icons from buttons with Cleanlooks

The icon buttons in cleanlooks were modeled after an early version of
the Gtk 2.0 Clearlooks theme. At the time, GNOME was using
icons on all buttons. For the past couple of years, GNOME has dropped
icons on buttons by default and as this is the common behavior on
other platforms as well, I think it is time to remove them.

The button size hack was also removed due to previously emulating
a GNOME behavior. The end result at the moment is only that it makes
the button height inconsistent with other widgets.

Change-Id: I22fe8c0b3a799a807cfff74a81cebf50e8ec33d3
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoSort qdoc ignores.
Frederik Gladhorn [Wed, 15 Aug 2012 11:53:32 +0000 (13:53 +0200)]
Sort qdoc ignores.

Change-Id: Icada1b073f12273fe8d7712a82a94bc7f3595d8b
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
12 years agodoc: Replaced FakeNode with DocNode
Martin Smith [Tue, 21 Aug 2012 13:43:51 +0000 (15:43 +0200)]
doc: Replaced FakeNode with DocNode

The name FakeNode was a bad choice. It was used
to represent something that wasn't derived from
a C++ declaration in a .h file. Any generic page
or QML item or any special kind of qdoc construct
was stored in a FakeNode. The name was unfortunate
because the constructs stored in FakeNodes were
just as real as C++ constructs.

So FakeNode has been renamed to DocNode, which
just refers to a documentation node. The node
type Fake has been replaced with node type
Document.

Change-Id: Ida9de8288b7b8915bf9273fd890ca84aaf05e182
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoFix docs for QRawFont.
Jason Barron [Tue, 21 Aug 2012 12:17:21 +0000 (14:17 +0200)]
Fix docs for QRawFont.

Use correct function name for 'swap' and replace QGlyphs -> QGlyphRun.

Change-Id: I4997a59ef643c688e8084a2013208fb760a2784a
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoPropagate initial size constraints to QWidgetWindow.
Friedemann Kleint [Mon, 20 Aug 2012 14:38:05 +0000 (16:38 +0200)]
Propagate initial size constraints to QWidgetWindow.

Size constraints set on a widget before the creation of
the QWidgetWindow were lost (for example, Qt Creator's
preference page).

Task-number: QTBUG-26745
Change-Id: I7c2f5aed9c8817795603e5ad3c24418d66627bab
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoTry to work around GCC 4.6's noexcept bugs, again
Thiago Macieira [Tue, 21 Aug 2012 09:09:44 +0000 (11:09 +0200)]
Try to work around GCC 4.6's noexcept bugs, again

Commit 7315296e9c94c38c842728aed199ac286a3ef174 blacklisted GCC 4.6.0
and 4.6.1 on the grounds that the bug regarding noexcept was fixed in
4.6.2. However, we have evidence of the issue remaining in 4.6.3, so it
looks like it was not the issue that the GCC team fixed.

For that reason, declare noexcept support in GCC 4.6 fatally broken and
enable it only for 4.7. It has been working fine for a month for me on
4.7.1.

Change-Id: Ic5a542235867f20657db12e0e809b83522dc7d23
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoReplace deprecated ATS calls with CTFontManager calls in 10.8
Jiang Jiang [Mon, 20 Aug 2012 08:37:01 +0000 (10:37 +0200)]
Replace deprecated ATS calls with CTFontManager calls in 10.8

Change-Id: I81c0361059319575e55621123d40b7c6f3c6b699
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix a bunch of Mac/clang specific warnings
Jiang Jiang [Mon, 13 Aug 2012 14:00:51 +0000 (16:00 +0200)]
Fix a bunch of Mac/clang specific warnings

Change-Id: I0ecc67d58fb7e727a88a5f546eeca01ff7554502
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix typo in QAbstractNetworkCache documentation.
Mitch Curtis [Tue, 21 Aug 2012 08:36:39 +0000 (10:36 +0200)]
Fix typo in QAbstractNetworkCache documentation.

"used be" => "used by"

Change-Id: Ibde738facab357d21604779f8b2145d32815ed66
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
12 years agoMaking trivial snippets inline
Gabriel de Dietrich [Mon, 20 Aug 2012 13:17:13 +0000 (15:17 +0200)]
Making trivial snippets inline

Change-Id: I8d8b5586579d3ee460b234b5a09462586ac1cfd0
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoMinor documentation fixes in item views.
Shawn Rutledge [Tue, 21 Aug 2012 09:05:33 +0000 (11:05 +0200)]
Minor documentation fixes in item views.

Change-Id: I986662ba48840e0195f0cfd4264e4d5d8b186c51
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agomerge mingw mkspec changes for cross compiling
Peter Kümmel [Mon, 20 Aug 2012 10:58:14 +0000 (12:58 +0200)]
merge mingw mkspec changes for cross compiling

Change-Id: I0f4705717c38ee4c05b5618c006d3cf066d75f49
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoWhitespace fixes
Shawn Rutledge [Thu, 16 Aug 2012 13:10:03 +0000 (15:10 +0200)]
Whitespace fixes

Change-Id: Ibfb48076ad62804344db6e9e97ac90fdcf82dc04
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agodoc: Fixed qdoc errors
Martin Smith [Wed, 15 Aug 2012 11:09:54 +0000 (13:09 +0200)]
doc: Fixed qdoc errors

These classes will not be public until Qt 5.1.
This change marks a few things internal, so they
don't cause qdoc errors in Qt 5.0. It also adds
a few qdoc comments for future use in Qt 5.1.

Change-Id: If90692b97653223d8a986f2ae1fff49c20cd444b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoReuse the same QAbstractTableModel implementation for 4 snippets
Shawn Rutledge [Wed, 15 Aug 2012 15:48:16 +0000 (17:48 +0200)]
Reuse the same QAbstractTableModel implementation for 4 snippets

They were really the same anyway.  This makes the source distro a bit
more compact and eliminates some qdoc errors of the form
../doc/snippets/reading-selections/model.cpp:51: Overrides a previous doc
../doc/snippets/itemselection/model.cpp:51: (The previous doc is here)

Change-Id: I7956f457422e9078c32de65cd421685f589c8a6c
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
12 years agoDisregard milliseconds in QTime::secsTo().
Mitch Curtis [Tue, 31 Jul 2012 09:34:43 +0000 (11:34 +0200)]
Disregard milliseconds in QTime::secsTo().

"The documentation states that "secsTo() does not take into account any
milliseconds", however, this is not the case. Given times 12:30:01.500
and 12:30:02.400 secsTo returns 0. If milliseconds are not taken into
account, I would expect this to return 1 (i.e. interprets the times as
12:30:01 and 12:30:02 thus truncating the milliseconds)."

Note that tests were also written for QDateTime::secsTo(), as it uses
QTime::secsTo internally. This addresses Javier's issue in the
comments of QTBUG-9304.

Task-number: QTBUG-9304
Change-Id: I9efe0c8f710db859c1d086d67ba3e5b349a56c4e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoSerialise QDateTime as UTC and timeSpec() instead of private spec.
Mitch Curtis [Thu, 16 Aug 2012 13:55:31 +0000 (15:55 +0200)]
Serialise QDateTime as UTC and timeSpec() instead of private spec.

QDateTime currently serialises its private Spec enum. If a user was to
deserialise the individual components of a QDateTime separately, the
resulting timeSpec may be invalid when cast to the Qt::TimeSpec enum.

E.g.:

QDateTime dateTime(QDate(2012, 8, 14), QTime(8, 0, 0), Qt::UTC);
// ... serialise
// ... deserialise date, time, spec separately.
// spec == 2, the value of QDateTimePrivate::UTC.
// spec != UTC, will be set to LocalUnknown.
QDateTime deserialised(date, time, spec);

This patch serialises QDateTime objects in UTC and the value of
timeSpec() as opposed to QDateTimePrivate's spec. This changes the
serialisation behaviour of QDateTime for version 13 of QDataStream.

Task-number: QTBUG-4057
Change-Id: If650e7960dca7b6ab44b8233410a6369c41df73a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agomake it possible to pass configure zlib lib name
Andreas Holzammer [Mon, 20 Aug 2012 17:54:58 +0000 (19:54 +0200)]
make it possible to pass configure zlib lib name

Change-Id: I82fde11436261dab51393b35dfbf2a753df58ec9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agocross compile with mingw
Peter Kümmel [Sat, 18 Aug 2012 14:12:49 +0000 (16:12 +0200)]
cross compile with mingw

  - improve defaults
  - fix linker errors

Change-Id: I7e1deb55fb616a3890510806593a0ab9a0a31d9a
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agodoc: Added \relates command to some function qdoc comments
Martin Smith [Fri, 17 Aug 2012 09:31:23 +0000 (11:31 +0200)]
doc: Added \relates command to some function qdoc comments

When a documented function is global, it must be related
to a namespace or class, or its documentation won't be
included anywhere.

When a documented function is a class member, the function
signature in the \fn command must include the class name
qualifier, e.g. QImage::isValid(), not just isValid()

Change-Id: I53e2230fa9468f94d51aec8cc76781d7ab755a13
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoAdd AVX support for the JPEG handler
Thiago Macieira [Wed, 15 Aug 2012 20:50:20 +0000 (22:50 +0200)]
Add AVX support for the JPEG handler

Apparently I had forgotten about this previously. Use the AVX conversion
function if the compiler could generate AVX code.

Note: the functions need to be declared outside of the function block
so namespace scoping works properly with MSVC. For functions declared
inside, it expects them to be in the global namespace.

Change-Id: I7b7248dbfce3cc7c580dee920407c205049cb746
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoRemove reference to 'How to Learn Qt' from qtwidgets module.
Jan-Arve Saether [Tue, 21 Aug 2012 07:00:24 +0000 (09:00 +0200)]
Remove reference to 'How to Learn Qt' from qtwidgets module.

Change-Id: Ib6bce643332d34450e64e191ca7beeec3bf12c9c
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoRemove warning about non existing paint device engine
Titta Heikkala [Thu, 16 Aug 2012 08:27:57 +0000 (11:27 +0300)]
Remove warning about non existing paint device engine

The QWindowsVistaStyle::drawPrimitive() method was trying to draw the
pixmap for an item in an item view even if the section width was zero
or less then zero. This resulted "QPainter::begin: Paint device
returned engine == 0, type: 2" error.
It's now checked that the width and the height of the section is
greater than zero before creating the painter.

Task-number: QTBUG-26047
Change-Id: I36dd2792fd505be773951e5ac36b0e3362ec2292
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQWindow documentation fixes; make pos, size and geometry properties
Shawn Rutledge [Fri, 17 Aug 2012 12:13:08 +0000 (14:13 +0200)]
QWindow documentation fixes; make pos, size and geometry properties

Change-Id: I745bbe5d0baa68fc7ee49d6fe76d3678f3212b3d
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
12 years agoFixed qdoc complaints for qsurface and qsurfaceformat.
Shawn Rutledge [Fri, 17 Aug 2012 15:51:16 +0000 (17:51 +0200)]
Fixed qdoc complaints for qsurface and qsurfaceformat.

Also QTBUG-25231

Change-Id: I54e1f2d4ca9a52590b28e4d5ea04a8ae4a48d318
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoQTouchDevice documentation
Shawn Rutledge [Fri, 17 Aug 2012 15:55:05 +0000 (17:55 +0200)]
QTouchDevice documentation

Change-Id: I33c39522c92ef1abd5572b757122f6467702b1e6
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
12 years agoDocument QTranslator::translate SIC (91d2ee5e09a6b4)
David Faure [Sun, 19 Aug 2012 09:42:08 +0000 (11:42 +0200)]
Document QTranslator::translate SIC (91d2ee5e09a6b4)

Detected by a unittest failure in KDE, due to the KDETranslator subclass
not being called anymore.

Change-Id: I0171117a677e2d58aba2f76bc27f7f1f7a521cc1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agofix some QTest documentation
Jeremy Katz [Fri, 17 Aug 2012 12:37:07 +0000 (14:37 +0200)]
fix some QTest documentation

* Use \b instead of \bold
* widnow -> window typo
* QTest::touchEvent's second parameter is QTouchDevice *, not
  QTouchEvent::DeviceType, and autoCommit defaults to true
* QSignalSpy::wait() isn't const

Change-Id: I75a91c1cd98b1c582cd654b2b72ad61e5c0e31d2
Reviewed-by: David Faure <faure@kde.org>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoCocoa: use filterNativeEvent instead of the deprecated filterEvent
Thiago Macieira [Mon, 20 Aug 2012 20:21:31 +0000 (22:21 +0200)]
Cocoa: use filterNativeEvent instead of the deprecated filterEvent

Change-Id: I76259d1a0d978fb2f7fb60cd0d05990365691b7e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
12 years agoFix decoding of QByteArray in the deprecated "encoded" setters in QUrl
Thiago Macieira [Thu, 16 Aug 2012 13:31:06 +0000 (15:31 +0200)]
Fix decoding of QByteArray in the deprecated "encoded" setters in QUrl

The asymmetry is intentional: the getters can use toLatin1() because the
called functions, with a QUrl::FullyEncoded parameter, return ASCII
only. This gives a small performance improvement over the need to run
the UTF-8 encoder.

However, the data passed to setters could contain non-ASCII binary data,
in addition to the percent-encoded data. We can't use fromUtf8 because
it's binary and we can't use toPercentEncoded because it already encoded.

Change-Id: I5ecdb49be5af51ac86fd9764eb3a6aa96385f512
Reviewed-by: David Faure <faure@kde.org>
12 years agotst_qurlinternal: use qurl_p.h instead of declaring the functions
Thiago Macieira [Mon, 20 Aug 2012 11:19:46 +0000 (13:19 +0200)]
tst_qurlinternal: use qurl_p.h instead of declaring the functions

Just in case someone (like me) changes the function signatures or adds
new functions.

Change-Id: I1025fea012d95ffe89acaf799aa58fd2b0babc80
Reviewed-by: David Faure <faure@kde.org>
12 years agoAdd Q_DECL_NOTHROW to some qHash functions
Thiago Macieira [Thu, 2 Aug 2012 13:51:52 +0000 (15:51 +0200)]
Add Q_DECL_NOTHROW to some qHash functions

The hashing functions for QDateTime and QHostAddress did not get the
noexcept keyword because they might allocate memory. QDateTime doesn't
do it now, but it could in the future. QHostAddress does allocate
memory today.

Change-Id: Ia5f80942944bfc2b8c405306c467bfd88ef0e48c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMoved a bunch of widgets example images from qtdoc to qtwidgets
J-P Nurmi [Mon, 20 Aug 2012 12:51:56 +0000 (14:51 +0200)]
Moved a bunch of widgets example images from qtdoc to qtwidgets

Change-Id: I46363e19051cca6f088f0ed6df1c9fd113b95fe7
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoQStyle docs: fix the location of two paintsystem related images
J-P Nurmi [Mon, 20 Aug 2012 12:26:08 +0000 (14:26 +0200)]
QStyle docs: fix the location of two paintsystem related images

The following images were misplaced into gui with the other painsystem
related images:
- ../styles/qstyle.cpp:80: Missing image: paintsystem-stylepainter.png
- ../styles/qstyle.cpp:80: Missing image: paintsystem-icon.png

Change-Id: I5a46db04d00b779a6028cda89e436feda75efef7
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoMoved a bunch of widget images from qtdoc to qtwidgets
J-P Nurmi [Mon, 20 Aug 2012 12:10:50 +0000 (14:10 +0200)]
Moved a bunch of widget images from qtdoc to qtwidgets

Change-Id: Id76e95f7bf7ccbe1716ef4172d36f337780e19f7
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoQFontComboBox: fix qdoc warning
J-P Nurmi [Mon, 20 Aug 2012 11:37:08 +0000 (13:37 +0200)]
QFontComboBox: fix qdoc warning

Remove link to self:
qfontcombobox.cpp:413: Can't create link to 'currentFontChanged()'

Change-Id: I6eba45ba1d68c6a2c9201fda8c04b47fc711b562
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoQTextEdit docs: fix qdoc warnings
J-P Nurmi [Fri, 17 Aug 2012 08:54:42 +0000 (10:54 +0200)]
QTextEdit docs: fix qdoc warnings

qdoc insists picking Q_PROPERTY(T document) instead of the individually
documented getter and setter

Change-Id: I6f4981db205c5726d70cef4d85b7dfffe2b1fe31
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoFix the doc errors in itemmodels and itemviews.
Stephen Kelly [Thu, 16 Aug 2012 12:55:29 +0000 (14:55 +0200)]
Fix the doc errors in itemmodels and itemviews.

Other errors remain, but they appear to be due to missing links
to QtCore documentation (a generic error not specific to itemviews).

Change-Id: I7b83380c3754c26d3d42be9ef0c0721ce3127562
Reviewed-by: Shawn Rutledge <shawn.rutledge@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoRemove QProxyModel from qtbase.
Stephen Kelly [Mon, 20 Aug 2012 10:30:45 +0000 (12:30 +0200)]
Remove QProxyModel from qtbase.

A copy is placed in uihelpers for anyone who might be using it.

Change-Id: I175f7bc5dcbf25a910d28bfd8985579866392938
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDisable C++11 noexcept support in GCC 4.6.0 and 4.6.1
Thiago Macieira [Sun, 19 Aug 2012 12:49:54 +0000 (14:49 +0200)]
Disable C++11 noexcept support in GCC 4.6.0 and 4.6.1

See report: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50309

Change-Id: I5ab3ab1dea42b03ea22dbfbe5f7039c537dabd33
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
12 years agoQAtomic: make ctors constexpr, if possible
Marc Mutz [Sun, 1 Jul 2012 21:22:38 +0000 (23:22 +0200)]
QAtomic: make ctors constexpr, if possible

This requires using the same chain of conditions that QBasicAtomic*
uses in order to provide constructors, so we're using the newly-added
macro QT_BASIC_ATOMIC_HAS_CONSTRUCTORS to check.

Even though QAtomic<> is a template, we can't just use Q_DECL_CONSTEXPR
since the body of the constructors needs to change, too.

Change-Id: I462a80ed175040f7709c30d07d34036c6c5507d8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQBasicAtomic: add QT_BASIC_ATOMIC_HAS_CONSTRUCTORS macro
Marc Mutz [Sun, 1 Jul 2012 21:19:47 +0000 (23:19 +0200)]
QBasicAtomic: add QT_BASIC_ATOMIC_HAS_CONSTRUCTORS macro

This macro is defined when the QBasicAtomic* types have constructors.
It will be used to simplify maintenance of QBasicAtomic subclasses,
as well as classes that aggregate Q(Basic)Atomics and wish to be
literal types if possible.

Change-Id: I7ab181c58a13ec2195449bbae5b3476b9017a8f2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix processor detection for MSVC ARM compiler (WEC7).
Janne Anttila [Thu, 9 Aug 2012 05:52:39 +0000 (08:52 +0300)]
Fix processor detection for MSVC ARM compiler (WEC7).

Visual Studio compiler defines _M_ARM preprocessor variable when
compiling for ARM and the value of preprocessor variable indicates the
supported instruction set.

For more information see:
http://msdn.microsoft.com/en-us/library/gg155713.aspx

Change-Id: I54137257b83f64fdf03bf7df9995e08d16dff4df
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoAdd missing #include <qmetatype.h>
Thiago Macieira [Mon, 20 Aug 2012 12:22:17 +0000 (14:22 +0200)]
Add missing #include <qmetatype.h>

There's a Q_DECLARE_METATYPE at the end of this file.

Change-Id: Ib63aa4397ccba8740d46cf1ee7af712f75d05765
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoMisc documentation fixes triggered by qdoc errors/warnings
Shawn Rutledge [Thu, 16 Aug 2012 16:19:39 +0000 (18:19 +0200)]
Misc documentation fixes triggered by qdoc errors/warnings

Change-Id: I6ca3b138114fe957a09e8ec2f22273865635fc8b
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoFix C++11 mode compilation with MinGW-w64 4.7.1
Yuchen Deng [Mon, 20 Aug 2012 05:03:36 +0000 (13:03 +0800)]
Fix C++11 mode compilation with MinGW-w64 4.7.1

Change-Id: I8b840ece7341877fb6f5d6a85d8714517034e319
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove references to "How to Learn Qt", since that is in qtdoc repo.
Jan-Arve Saether [Mon, 20 Aug 2012 14:38:35 +0000 (16:38 +0200)]
Remove references to "How to Learn Qt", since that is in qtdoc repo.

Don't use \n in qdoc comments.

Change-Id: I875e37f6a13ab0b7f66da985a2cf157017934bbd
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoFix multiple enumeration warnings when generating docs
Jens Bache-Wiig [Mon, 20 Aug 2012 09:12:48 +0000 (11:12 +0200)]
Fix multiple enumeration warnings when generating docs

Most of these caused by cleaning up enums and not removing
omitted values. Also removed some leftovers from qt3support.

Change-Id: I75efcc9fadc6a430492bab36e86d7b345d3a6a17
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
12 years agoRemove dialogs doc related warnings
Gabriel de Dietrich [Thu, 16 Aug 2012 16:39:53 +0000 (18:39 +0200)]
Remove dialogs doc related warnings

Change-Id: I79a771d18913237d894ca1a5aeaa07586106c645
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
12 years agoSpeed up sorting of dir entries when sorted by date
Robin Burchell [Wed, 15 Aug 2012 11:37:15 +0000 (13:37 +0200)]
Speed up sorting of dir entries when sorted by date

QDateTime will attempt to convert unknown types of date to UTC time, which isn't
exactly a fast process. As we don't care about local timezones in the process of
sorting (as this is purely for ordering, not display to the end user), we can
force the dates to use UTC time, avoiding the unnecessary local timezone lookup.

This also adds a benchmark covering this case.

Benchmark results, Qt 5:
 - before: 11, 489ms
 - after: 273ms

Qt 4.8:
 - before: 20, 848ms
 - after: 278ms

Change-Id: I87fa6260e820b5b172d3306ff395dafe767c33ff
Reported-by: Thomas Perl <m@thp.io>
Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoDoc: Work on QVariant's equality operator.
Geir Vattekar [Mon, 20 Aug 2012 12:31:32 +0000 (14:31 +0200)]
Doc: Work on QVariant's equality operator.

Task-number: QTBUG-26018
Change-Id: I6627456d166bc0a036cadeee7bd51aa8e576a818
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoEnable QComboBox animation on Windows and fixing related bugs
Thomas Hartmann [Fri, 17 Aug 2012 09:10:15 +0000 (11:10 +0200)]
Enable QComboBox animation on Windows and fixing related bugs

QWidget:grab() has a default parameter (invalid rect).
QRect() is the null rect and widget->grab(QRect())
returns an empty pixmap.

QWidget:grab() has to be free of side effects and should not
affect any dirty flags.

Change-Id: I8ff558343c366769cd6c587e77f862668e8054f2
Task-number: QTBUG-25436
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoReplace \QD with the literal 'Qt Designer' to avoid warnings.
Jan-Arve Saether [Mon, 20 Aug 2012 13:43:28 +0000 (15:43 +0200)]
Replace \QD with the literal 'Qt Designer' to avoid warnings.

Change-Id: Ia28ab42531217df75b626638b1953c393d2e445e
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
12 years agoFix freetype font rendering for Windows CE
Andreas Holzammer [Mon, 20 Aug 2012 09:25:41 +0000 (11:25 +0200)]
Fix freetype font rendering for Windows CE

Windows CE does not have support for GetGlyphOutline.
So addGlyphToPath will not work. QML uses it for their
distance field rendering. One option to bypass this issue
is to use freetype as rendering backend.

Change-Id: I965254344945cbdad771a5d505fb61c1cc2087df
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoMoving .qdoc files under examples/widgets/doc
Gabriel de Dietrich [Fri, 17 Aug 2012 11:23:19 +0000 (13:23 +0200)]
Moving .qdoc files under examples/widgets/doc

Updated those .qdoc files to refer to the new relative examples
emplacement. Images and snippets to be moved later.

Also grouped all widgets related examples under widgets.

Change-Id: Ib29696e2d8948524537f53e8dda88f9ee26a597f
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
12 years agoFix documented QMetaType::UserType value.
Aaron McCarthy [Thu, 26 Jul 2012 04:04:28 +0000 (14:04 +1000)]
Fix documented QMetaType::UserType value.

QMetaType::UserType was changed from 256 to 1024, this was not reflected
in the code parsed by qdoc.

Change-Id: I0a02e8b020d495fbf2508d84b690adae1b677125
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoOpenGL: Use official glext.h and gl2ext.h headers
Sean Harmer [Fri, 8 Jun 2012 08:39:17 +0000 (09:39 +0100)]
OpenGL: Use official glext.h and gl2ext.h headers

The Khronos group makes the glext.h (Desktop OpenGL) and gl2ext.h
(OpenGL ES2) headers officially available nowadays. Most (all?)
Linux systems ship this by default. On Windows platforms the
glext.h file needs to be downloaded from

http://www.opengl.org/registry/api/glext.h

and placed alongside the system OpenGL header.

Making use of the official header reduces the maintenance
overhead for OpenGL support in Qt by removing the need to copy
and paste definitions into the Qt sources.

As the Khronos-provided headers are standardised and backwards and
forwards compatible we can utilise these for all platforms rather
than just for Windows. This means that all definitions required
by Qt will be present even if the system ships out-dated
equivalents.

Mac OS X needs special handling in that we should always use the
system-provided headers there. This is because Apple controls the
OpenGL driver and the headers that go along with it. As such there
is no possibility that the driver exposes additional functionality
compared with the system-provided OpenGL headers. Apple has also
decided to make different decisions about some OpenGL typedefs
compared to other implementations. For example, Apple typdefs
GLhandleARB to void* whereas other platforms use unsigned int.

The alternative, which is to use the system provided glext.h (or
gl2ext.h) header means that Qt code would need to check for the
availability of such definitions wherever it is not guaranteed
to be provided by core OpenGL/ES just to compile.

The proposed approach means that Qt can compile regardless of
the system's OpenGL extension support. We just need to be
rigourous in runtime checking of support for extensions but
that is already a requirement (and is missing in a few places,
see TODO's added in this commit).

The official Khronos headers are added to Qt as

qopenglext.h - Desktop OpenGL
qopengles2ext.h - OpenGL ES2

They need to be public but not part of QtGui module include, hence
the headers have been modified by adding

 #if 0
 #pragma qt_no_master_include
 #endif

to them.

This has been tested on:

Gentoo Linux with GCC 4.6.3
Windows 7 with MSVC 2010
Mac OSX 10.8 with Apple clang 4.0 (based on LLVM 3.1svn)
QNX with qcc (based on GCC 4.4)

A small change is needed to QtDeclarative when building for OpenGL
ES 2 after applying this commit. See
https://codereview.qt-project.org/#change,31794

Change-Id: I4b3d2b1680baf4c78be9a87b4d8de076d23e8f82
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoTake account of hidden items in QListView when using scrollTo.
Stephen Kelly [Mon, 6 Aug 2012 09:34:56 +0000 (11:34 +0200)]
Take account of hidden items in QListView when using scrollTo.

Task-number: QTBUG-21804
Change-Id: I475166f3f60b1278089baa255ace4e18baeb568e
Reviewed-by: Jani Honkonen <jani.honkonen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoReplace deprecated ColorSync Manager use with updated CG API
Jiang Jiang [Mon, 13 Aug 2012 15:12:28 +0000 (17:12 +0200)]
Replace deprecated ColorSync Manager use with updated CG API

ColorSync Manager is deprecated in 10.6 and new CG API for
copying color space is available since 10.5.

Change-Id: I730431dcd28ca0ff6cec5d1eeff99fff9f3d0a29
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix in-process QAxServers inside modal windows.
Miikka Heikkinen [Fri, 17 Aug 2012 11:19:36 +0000 (14:19 +0300)]
Fix in-process QAxServers inside modal windows.

The main window of in-process QAxServers doesn't have QWindow parent,
but it does have native parent that is part of the native window tree
of the application. The lack of Qt parent makes embedded controls look
like toplevel windows, which causes problems e.g. with modality.

Introduced new optional method QPlatformWindow::isEmbedded() to
detect if a window is an embedded window and utilized it in proper
places during modality handling.

Task-number: QTBUG-26871
Change-Id: Iac9a51dae06b8fc15410de7838857e203e4275b8
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoEnsure that all the children get the new stylesheet set on a parent
Andy Shaw [Tue, 7 Aug 2012 04:31:38 +0000 (06:31 +0200)]
Ensure that all the children get the new stylesheet set on a parent

When a stylesheet was set on a parent widget then in some cases it would
not get applied to all the child widgets.  This was because the order of
the children list may have been modified while it was being set on
children.  By making a copy of the list we prevent this from being a
problem.

Task-number: QTBUG-26321

Change-Id: Iea6bf72c69a0c39746f7ef5e7893dda5a93ed7e5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix drag curor visibility on Windows.
Janne Anttila [Wed, 8 Aug 2012 12:34:06 +0000 (15:34 +0300)]
Fix drag curor visibility on Windows.

QDrag has an API to set both pixmap (QDrag::setPixmap) and drag cursor
(QDrag::setDragCursor): http://qt-project.org/doc/qt-5.0/qdrag.html.

We cannot return from createCursors if there is no pixmap, but we need
to go through also dragCursor and use those if one is set.

Change-Id: If2b2139ad193a4ab5b25c65400c595dc7c33de2c
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoUse QThread instead of QPushButton as an example in the docs
Lars Knoll [Fri, 17 Aug 2012 06:50:10 +0000 (08:50 +0200)]
Use QThread instead of QPushButton as an example in the docs

This keeps links local and inside the module.

Change-Id: I5e267197c6356a2c4e231c1941ed4be33b96a16e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix more qdoc errors
Lars Knoll [Thu, 16 Aug 2012 21:57:02 +0000 (23:57 +0200)]
Fix more qdoc errors

Change-Id: Ieed340068327f37ea0f549d24ea49235994118f4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>