profile/ivi/qtbase.git
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 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>
11 years agoFix qdoc errors in qcoreevent.
Lars Knoll [Thu, 16 Aug 2012 17:07:16 +0000 (19:07 +0200)]
Fix qdoc errors in qcoreevent.

Change-Id: Ic6cb963a7df643819dfdd93c7300d054e11cd0d4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix qdoc errors in the QAbstractEventDispatcher documentation.
Lars Knoll [Thu, 16 Aug 2012 16:58:33 +0000 (18:58 +0200)]
Fix qdoc errors in the QAbstractEventDispatcher documentation.

Change-Id: I7de48286f05b14c831f1290e009a25630504a76e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix some qdoc errors in the QJson* classes
Lars Knoll [Thu, 16 Aug 2012 16:58:00 +0000 (18:58 +0200)]
Fix some qdoc errors in the QJson* classes

Change-Id: If475655445afdba307508c5a3863c4bc8d87ebe6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix snippet bug in State Machine Overview
Lars Knoll [Thu, 16 Aug 2012 13:10:50 +0000 (15:10 +0200)]
Fix snippet bug in State Machine Overview

Cherry-pick of b0facd481a2fc119d87c85481d97357d814a5fd2
from the qtdoc repository.

Task-number: QTBUG-25314
Change-Id: I2166db46399ea6da8cadf02a7f65738c0c252142
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix a couple of qdoc errors.
Lars Knoll [Thu, 16 Aug 2012 13:00:31 +0000 (15:00 +0200)]
Fix a couple of qdoc errors.

Change-Id: I0770fc61e265face4fa061be9e110814effee181
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoRefactor the automatic metatype templates into preprocessor lists.
Stephen Kelly [Thu, 16 Aug 2012 00:18:19 +0000 (02:18 +0200)]
Refactor the automatic metatype templates into preprocessor lists.

This will allow re-use in moc.

Change-Id: I99c5f8f0756fccf0fb2bb845c29255c14d4d703e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
11 years agoFix a QListViewItem width when spacing is set
Jani Honkonen [Thu, 16 Aug 2012 13:08:35 +0000 (16:08 +0300)]
Fix a QListViewItem width when spacing is set

The listitem width was calculated incorrectly because spacing was
not considered. This fixes the second part of the reported bug where
spacing is set. Added some tests to catch the issue relating to the
reported bug.

Also added a test to check spacing in general.

Task-number: QTBUG-21804
Change-Id: Icc6326bce914264d882a60a9fc0ebe7d2a08dbf6
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoFix QListWidget scrolling with keys when there are hidden items
Jani Honkonen [Wed, 1 Aug 2012 11:55:51 +0000 (14:55 +0300)]
Fix QListWidget scrolling with keys when there are hidden items

If the selected item is scrolled with keyboard keys the selected item
will go outside the visible area. The scrolling did not take hidden
items into account when calculating the amount to be scrolled.

Task-number: QTBUG-21804
Change-Id: I63da0248cec43be464898f9dc8167e739f00ccd0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoDoc: Small addition to QAbstractTextDocumentLayout::registerHandler()
Geir Vattekar [Tue, 14 Aug 2012 13:01:07 +0000 (15:01 +0200)]
Doc: Small addition to QAbstractTextDocumentLayout::registerHandler()

Task-number: QTBUG-23345
Change-Id: I6f768472aaef95f5dd88cf896ef3e635d223b635
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@nokia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
11 years agoDoc: Add FOV to rogue example.
Geir Vattekar [Wed, 15 Aug 2012 13:33:13 +0000 (15:33 +0200)]
Doc: Add FOV to rogue example.

Change-Id: Ib0f4caad9bc828a94616466f303d879fc967970d
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
11 years agodoc: Fixed qdoc errors in SSL
Martin Smith [Thu, 16 Aug 2012 08:02:59 +0000 (10:02 +0200)]
doc: Fixed qdoc errors in SSL

Fixed some bad camel case, marked some parameters with \a,
and changed a \enum to a \typedef. Removed some obasolete
text.

Change-Id: I1e69dd9f3b74129230770addc80fe1c125faf268
Reviewed-by: Richard J. Moore <rich@kde.org>
11 years agoIgnore Q_DECL_NOTHROW in qdoc for Qt Core
Jeremy Katz [Thu, 16 Aug 2012 14:27:45 +0000 (16:27 +0200)]
Ignore Q_DECL_NOTHROW in qdoc for Qt Core

This change was already made in the qtdoc repo, but qtcore doesn't
pick up the configuration from there.

Change-Id: I72e747d748705e508521aeba1992d0c47faf2dac
Reviewed-by: Martin Smith <martin.smith@nokia.com>
11 years agoEnable QAtomicInteger for char16_t and char32_t
Thiago Macieira [Mon, 6 Aug 2012 16:15:49 +0000 (18:15 +0200)]
Enable QAtomicInteger for char16_t and char32_t

Those are regular, integer types, of 16- and 32-bit width,
respectively. C++11's std::atomic supports them, so we should too.

C++11 also supports wchar_t, but since that type's size can change, I
don't feel like support for it in Qt is pressing.

Change-Id: I945b641c91a8a98be82715f878c382dee58ac98b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoAdd Q_DECL_CONSTEXPR to the isXXX functions in the new atomics.
Thiago Macieira [Mon, 6 Aug 2012 16:03:49 +0000 (18:03 +0200)]
Add Q_DECL_CONSTEXPR to the isXXX functions in the new atomics.

This allows one to write code that depends on these values at
compile-time.

Change-Id: I7d78524ed9c70d4141360496d1d764dcbfa92e62
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix -Wclobbered warnings
Marc Mutz [Wed, 15 Aug 2012 17:25:44 +0000 (19:25 +0200)]
Fix -Wclobbered warnings

GCC warns:

  warning: argument 'x' might be clobbered by 'longjmp' or 'vfork' [-Wclobbered]

Apparently, the real fix would be annotating the functions correctly
with noreturn and returns_twice attributes, but there's also workarounds
for these, at least in the png case, so adding volatile was the easier
way out here.

Needed a cast to lose the volatile again, passing the argument to qMin().

Change-Id: Id820cf9b65752359f3b8f268172ba71bc9a76784
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoUpdated .gitignore
J-P Nurmi [Fri, 17 Aug 2012 12:23:23 +0000 (14:23 +0200)]
Updated .gitignore

Change-Id: Ic5abac7bbcd74180dbe762b7871bb865bd2fbb76
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoAuto test for passing QTextEdit as QSyntaxHighlighter parent
J-P Nurmi [Fri, 17 Aug 2012 08:52:54 +0000 (10:52 +0200)]
Auto test for passing QTextEdit as QSyntaxHighlighter parent

Change-Id: Ia225723de5b0b2085a72a2af26e2a563b65955d8
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
11 years agoRegister QTextDocument* as a meta type to fix QTextEdit::document type
J-P Nurmi [Fri, 17 Aug 2012 08:49:36 +0000 (10:49 +0200)]
Register QTextDocument* as a meta type to fix QTextEdit::document type

Change-Id: I666845049749bfa6f88b764eefaefb0dcf05cb3f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
11 years agoModernise, update and fix errors in the QUrl documentation
Thiago Macieira [Thu, 16 Aug 2012 13:28:33 +0000 (15:28 +0200)]
Modernise, update and fix errors in the QUrl documentation

Update the documentation of the deprecated API to match the current
behaviour. Notably, the current behaviour is to check the correctness of
the percent-encoding even in the "encoded" functions. Also, the use of
QUrlQuery makes the matching work on canonical forms, so "%73earch" does
match "search".

Elsewhere, make sure we do not refer to the deprecated API in the
documentation of non-deprecated functions.

Change-Id: If3505ac3c6121177ad6ab18199e143775bef44b9
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
11 years agoBring back the documentation on QUrl deprecated methods
Thiago Macieira [Thu, 16 Aug 2012 12:56:59 +0000 (14:56 +0200)]
Bring back the documentation on QUrl deprecated methods

The deprecated query methods were removed along with their documentation
in commit 1c2144c39fa0069bf496e8f77389a9c2f8a31acf, so restore it from
before that commit.

The rest of the encoded methods were removed along with their
documentation in commit 1372d60bde04a31c8036601076d1093a67c6bd46.
Restore their documentation from the previous commit to that one.

All the documentation from this commit is brought back unchanged, except
for the addition of \deprecated.

Change-Id: I1851b0dc922c681e1623359b35dfd0f505d258d2
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
11 years agoFix a couple of qdoc errors
Lars Knoll [Wed, 15 Aug 2012 20:53:10 +0000 (22:53 +0200)]
Fix a couple of qdoc errors

Change-Id: I79f689e08ed4a496052529af38fca72c3d4e04cb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoClean up QScreen::grabWindow()
aavit [Fri, 17 Aug 2012 12:15:36 +0000 (14:15 +0200)]
Clean up QScreen::grabWindow()

Handle 0 WId parameter as meaning "desktop window"/whole screen.
Also, re-add the default values for the grab area, both for
convenience and compatibility with QPixmap::grabWindow() in Qt4.
Update the screenshot example so it doesn't comlain about usage of
deprecated QPixmap::grabWindow().

Change-Id: I2ad229113ddb8ded0388f2ebc0e8c703c6657f1f
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
11 years agoAdd a changes file entry for QMetaType QObject related change.
Stephen Kelly [Wed, 15 Aug 2012 14:46:36 +0000 (16:46 +0200)]
Add a changes file entry for QMetaType QObject related change.

Change-Id: I2f902ffe6b18034047114626dd4cbe9d2f96c2fc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoExclude the qplatformdefs CMake test on Windows.
Stephen Kelly [Fri, 10 Aug 2012 11:18:54 +0000 (13:18 +0200)]
Exclude the qplatformdefs CMake test on Windows.

The fix for this failing test is not yet agreed to. Disable it to
allow progress with the CI system while the fix is decided.

Task-number: QTBUG-26869
Change-Id: Ia8089b8e66d750353e7c1c69597916af0d042856
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
11 years agoRemove QWidgetStar.
Stephen Kelly [Thu, 19 Jul 2012 12:33:28 +0000 (14:33 +0200)]
Remove QWidgetStar.

This allows us to remove the odd hacks to get the static metaobject
for the QWidget* metatype.

The QWidget* is still an automatic metatype thanks to the QObject
partial template specialization. It is registered as a metatype
at runtime automatically in qwidgetsvariant.cpp.

Change-Id: Ie01b69eadf2cbe87af1a86c3284550f60dcf9e94
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoAdd Q_DECL_NOTHROW to the tokens qdoc ignores
Lars Knoll [Wed, 15 Aug 2012 20:50:30 +0000 (22:50 +0200)]
Add Q_DECL_NOTHROW to the tokens qdoc ignores

This fixes a couple of qdoc errors on methods that
are declared as nothrow.

Change-Id: I22bcd18253665280a5c1c3a38539dacf8f869c57
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix most qdoc errors for QMap
Lars Knoll [Wed, 15 Aug 2012 21:12:07 +0000 (23:12 +0200)]
Fix most qdoc errors for QMap

Change-Id: I8cac3b63cab32c655f722aca467489730c3f0a42
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoMove the statemachine documentation into qtcore
Lars Knoll [Thu, 16 Aug 2012 07:39:59 +0000 (09:39 +0200)]
Move the statemachine documentation into qtcore

Moved the documentation from qtdoc to here, so the
statemachine class docs can link to it.

Change-Id: I49a10cc7c418d415c64ea538376eb9bd7b031c27
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
11 years agoMove the animation overview doc into QtCore
Lars Knoll [Thu, 16 Aug 2012 07:43:27 +0000 (09:43 +0200)]
Move the animation overview doc into QtCore

Moved here from the qtdoc module.

Change-Id: Ib263848e0637204ec3b0cba973076ca79a25a953
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoFix qdoc erros in qfile and related classes
Lars Knoll [Thu, 16 Aug 2012 08:20:50 +0000 (10:20 +0200)]
Fix qdoc erros in qfile and related classes

Change-Id: I56b66e6eeb06c84e1157a701a814aebb1ddf4845
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoPass NEON_ASM directly to SOURCES.
Rafael Roquetto [Fri, 17 Aug 2012 12:43:01 +0000 (14:43 +0200)]
Pass NEON_ASM directly to SOURCES.

This guarantees that qmake gives them the proper flags (non C++) while
building these asm files.

Change-Id: I41150f543b8fac81bcd0da963b4d0e0a19b9db2f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMark simple static methods in QThread as Q_DECL_NOTHROW
Thiago Macieira [Mon, 6 Aug 2012 14:10:33 +0000 (16:10 +0200)]
Mark simple static methods in QThread as Q_DECL_NOTHROW

These methods aren't often used, but currentThreadId() gets used in the
recursive mutex code to store the identity of the thread with multiple
locks.

Change-Id: I031cf3893aa6e7fd7a53733fc1088d295bdb9079
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoEmit layoutChange signals when changing QPersistentModelIndexes.
Stephen Kelly [Mon, 13 Aug 2012 09:53:05 +0000 (11:53 +0200)]
Emit layoutChange signals when changing QPersistentModelIndexes.

This is necessary whenever QPersistentModelIndexes are changed. Omitting
it means that views are not able to react to the change, such as QTreeView
clearing its (manually held) QModelIndex cache, and the QItemSelectionModel
clearing the item from its storage.

It is necessary to change a QSortFilterProxyModel test which assumed setItem
does not have any such effect. That test is ported to setData instead.

Task-number: QTBUG-18539
Change-Id: Id7a602f18b9773ba4d11019418de886860d26d3e
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
11 years agoQAbstractSlider: fix qdoc warnings
J-P Nurmi [Wed, 15 Aug 2012 14:07:57 +0000 (16:07 +0200)]
QAbstractSlider: fix qdoc warnings

Change-Id: I996d45513a0239d0ed11669ce6e238955ec8a31b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
11 years agoQSlider: fix qdoc warnings
J-P Nurmi [Wed, 15 Aug 2012 14:01:12 +0000 (16:01 +0200)]
QSlider: fix qdoc warnings

Removed some Qt3 support leftovers and docs for qt_qsliderStyleOption()
that qdoc wasn't able to tie to anything.

Change-Id: I49bb886b639fe11e4923ef8486e0b9f8a966b10c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
11 years agoQLCDNumber docs: cleanup Qt3 support leftovers
J-P Nurmi [Wed, 15 Aug 2012 13:41:01 +0000 (15:41 +0200)]
QLCDNumber docs: cleanup Qt3 support leftovers

Change-Id: I22378c5334ac830e94060f20568e200f0ee49280
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
11 years agoRemove docs for removed functions.
Frederik Gladhorn [Wed, 15 Aug 2012 13:28:52 +0000 (15:28 +0200)]
Remove docs for removed functions.

Change-Id: I75ec0137c56581653ee0dd6fd84f10f0a6c3429c
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
11 years agoReference proper example.
Frederik Gladhorn [Wed, 15 Aug 2012 14:01:46 +0000 (16:01 +0200)]
Reference proper example.

Change-Id: Icda7e21f7e1eee8d4a6939ce3a50d1874ecda1e6
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
11 years agoRemove outdated docs.
Frederik Gladhorn [Wed, 15 Aug 2012 12:00:08 +0000 (14:00 +0200)]
Remove outdated docs.

Change-Id: I6eaffdad3b800b7d90478cb7c4044ec27e659ec9
Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
11 years agoQMessageLogger: mark noDebug() as nothrow
Marc Mutz [Fri, 3 Aug 2012 08:58:19 +0000 (10:58 +0200)]
QMessageLogger: mark noDebug() as nothrow

Change-Id: Ib01ad955844e8da376c687876141ad8f21776613
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
11 years agoQMessageLogger: make member functions const
Marc Mutz [Wed, 25 Jul 2012 08:04:58 +0000 (10:04 +0200)]
QMessageLogger: make member functions const

Just because we can :)

It looks a bit weird that QMessageLogger has a constexpr
constructor, but no const methods...

Change-Id: I794dd2b3326c45be17b29decb47c9cac4778d397
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
11 years agoMoved guibooks.qdoc from qtdoc to qtwidgets
J-P Nurmi [Wed, 15 Aug 2012 11:58:29 +0000 (13:58 +0200)]
Moved guibooks.qdoc from qtdoc to qtwidgets

Change-Id: I69e07b7a343c99ebafc7bf4587041b6f9ddbd37e
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
11 years agoExclude snippets
Jan-Arve Saether [Fri, 17 Aug 2012 11:39:59 +0000 (13:39 +0200)]
Exclude snippets

Change-Id: Ia31d7923e9a121eb7c16a1fe059dc8c9a5b61bd1
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
11 years agoDoc: Fix spelling errors
Sergio Ahumada [Thu, 16 Aug 2012 08:46:42 +0000 (10:46 +0200)]
Doc: Fix spelling errors

Change-Id: Ibae8d10183f6b15a16b1499daa2df8802dbb014e
Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com>
11 years agoMake qdoc ignore Q_WIDGETS_EXPORT.
Frederik Gladhorn [Thu, 16 Aug 2012 13:35:20 +0000 (15:35 +0200)]
Make qdoc ignore Q_WIDGETS_EXPORT.

Change-Id: Ic76ba6260a219f5a7f336e6bc15654bc827dfcd3
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>