summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Making trivial snippets inlineGabriel de Dietrich2012-08-2112-352/+47
| | | | | | | 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>
* Minor documentation fixes in item views.Shawn Rutledge2012-08-213-10/+9
| | | | | Change-Id: I986662ba48840e0195f0cfd4264e4d5d8b186c51 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* merge mingw mkspec changes for cross compilingPeter Kümmel2012-08-213-143/+12
| | | | | Change-Id: I0f4705717c38ee4c05b5618c006d3cf066d75f49 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Whitespace fixesShawn Rutledge2012-08-216-11/+11
| | | | | | Change-Id: Ibfb48076ad62804344db6e9e97ac90fdcf82dc04 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* doc: Fixed qdoc errorsMartin Smith2012-08-212-107/+78
| | | | | | | | | | 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>
* Reuse the same QAbstractTableModel implementation for 4 snippetsShawn Rutledge2012-08-2113-940/+19
| | | | | | | | | | 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>
* Disregard milliseconds in QTime::secsTo().Mitch Curtis2012-08-213-1/+16
| | | | | | | | | | | | | | | | "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>
* Serialise QDateTime as UTC and timeSpec() instead of private spec.Mitch Curtis2012-08-212-6/+103
| | | | | | | | | | | | | | | | | | | | | | | 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>
* make it possible to pass configure zlib lib nameAndreas Holzammer2012-08-213-2/+9
| | | | | Change-Id: I82fde11436261dab51393b35dfbf2a753df58ec9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* cross compile with mingwPeter Kümmel2012-08-211-1/+7
| | | | | | | | | - improve defaults - fix linker errors Change-Id: I7e1deb55fb616a3890510806593a0ab9a0a31d9a Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* doc: Added \relates command to some function qdoc commentsMartin Smith2012-08-214-1/+13
| | | | | | | | | | | | | 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>
* Add AVX support for the JPEG handlerThiago Macieira2012-08-211-3/+13
| | | | | | | | | | | | 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>
* Remove reference to 'How to Learn Qt' from qtwidgets module.Jan-Arve Saether2012-08-211-3/+0
| | | | | Change-Id: Ib6bce643332d34450e64e191ca7beeec3bf12c9c Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Remove warning about non existing paint device engineTitta Heikkala2012-08-211-26/+28
| | | | | | | | | | | | | | 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>
* QWindow documentation fixes; make pos, size and geometry propertiesShawn Rutledge2012-08-212-55/+107
| | | | | Change-Id: I745bbe5d0baa68fc7ee49d6fe76d3678f3212b3d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* Fixed qdoc complaints for qsurface and qsurfaceformat.Shawn Rutledge2012-08-212-15/+51
| | | | | | | Also QTBUG-25231 Change-Id: I54e1f2d4ca9a52590b28e4d5ea04a8ae4a48d318 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QTouchDevice documentationShawn Rutledge2012-08-211-3/+6
| | | | | Change-Id: I33c39522c92ef1abd5572b757122f6467702b1e6 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
* Document QTranslator::translate SIC (91d2ee5e09a6b4)David Faure2012-08-211-0/+3
| | | | | | | | 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>
* fix some QTest documentationJeremy Katz2012-08-212-7/+7
| | | | | | | | | | | | * 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>
* Cocoa: use filterNativeEvent instead of the deprecated filterEventThiago Macieira2012-08-201-3/+3
| | | | | Change-Id: I76259d1a0d978fb2f7fb60cd0d05990365691b7e Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Fix decoding of QByteArray in the deprecated "encoded" setters in QUrlThiago Macieira2012-08-207-14/+123
| | | | | | | | | | | | | | 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>
* tst_qurlinternal: use qurl_p.h instead of declaring the functionsThiago Macieira2012-08-202-10/+2
| | | | | | | | Just in case someone (like me) changes the function signatures or adds new functions. Change-Id: I1025fea012d95ffe89acaf799aa58fd2b0babc80 Reviewed-by: David Faure <faure@kde.org>
* Add Q_DECL_NOTHROW to some qHash functionsThiago Macieira2012-08-2010-38/+44
| | | | | | | | | | | | 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>
* Moved a bunch of widgets example images from qtdoc to qtwidgetsJ-P Nurmi2012-08-2033-0/+0
| | | | | Change-Id: I46363e19051cca6f088f0ed6df1c9fd113b95fe7 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* QStyle docs: fix the location of two paintsystem related imagesJ-P Nurmi2012-08-202-0/+0
| | | | | | | | | | 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>
* Moved a bunch of widget images from qtdoc to qtwidgetsJ-P Nurmi2012-08-2024-0/+0
| | | | | Change-Id: Id76e95f7bf7ccbe1716ef4172d36f337780e19f7 Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* QFontComboBox: fix qdoc warningJ-P Nurmi2012-08-201-1/+1
| | | | | | | | 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>
* QTextEdit docs: fix qdoc warningsJ-P Nurmi2012-08-201-11/+4
| | | | | | | | 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>
* Fix the doc errors in itemmodels and itemviews.Stephen Kelly2012-08-207-9/+64
| | | | | | | | | 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>
* Remove QProxyModel from qtbase.Stephen Kelly2012-08-208-797/+5
| | | | | | | A copy is placed in uihelpers for anyone who might be using it. Change-Id: I175f7bc5dcbf25a910d28bfd8985579866392938 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Disable C++11 noexcept support in GCC 4.6.0 and 4.6.1Thiago Macieira2012-08-201-0/+5
| | | | | | | | 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>
* QAtomic: make ctors constexpr, if possibleMarc Mutz2012-08-201-0/+12
| | | | | | | | | | | | 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>
* QBasicAtomic: add QT_BASIC_ATOMIC_HAS_CONSTRUCTORS macroMarc Mutz2012-08-201-2/+6
| | | | | | | | | | 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>
* Fix processor detection for MSVC ARM compiler (WEC7).Janne Anttila2012-08-201-4/+7
| | | | | | | | | | | | | 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>
* Add missing #include <qmetatype.h>Thiago Macieira2012-08-201-0/+1
| | | | | | | There's a Q_DECLARE_METATYPE at the end of this file. Change-Id: Ib63aa4397ccba8740d46cf1ee7af712f75d05765 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Misc documentation fixes triggered by qdoc errors/warningsShawn Rutledge2012-08-204-25/+17
| | | | | Change-Id: I6ca3b138114fe957a09e8ec2f22273865635fc8b Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Fix C++11 mode compilation with MinGW-w64 4.7.1Yuchen Deng2012-08-201-2/+2
| | | | | Change-Id: I8b840ece7341877fb6f5d6a85d8714517034e319 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove references to "How to Learn Qt", since that is in qtdoc repo.Jan-Arve Saether2012-08-202-6/+1
| | | | | | | Don't use \n in qdoc comments. Change-Id: I875e37f6a13ab0b7f66da985a2cf157017934bbd Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Fix multiple enumeration warnings when generating docsJens Bache-Wiig2012-08-202-17/+0
| | | | | | | | 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>
* Remove dialogs doc related warningsGabriel de Dietrich2012-08-205-72/+3
| | | | | Change-Id: I79a771d18913237d894ca1a5aeaa07586106c645 Reviewed-by: J-P Nurmi <j-p.nurmi@nokia.com>
* Speed up sorting of dir entries when sorted by dateRobin Burchell2012-08-202-2/+25
| | | | | | | | | | | | | | | | | | | | | | 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>
* Doc: Work on QVariant's equality operator.Geir Vattekar2012-08-201-2/+13
| | | | | | Task-number: QTBUG-26018 Change-Id: I6627456d166bc0a036cadeee7bd51aa8e576a818 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Enable QComboBox animation on Windows and fixing related bugsThomas Hartmann2012-08-203-2/+5
| | | | | | | | | | | | | | | 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>
* Replace \QD with the literal 'Qt Designer' to avoid warnings.Jan-Arve Saether2012-08-204-6/+6
| | | | | Change-Id: Ia28ab42531217df75b626638b1953c393d2e445e Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Fix freetype font rendering for Windows CEAndreas Holzammer2012-08-207-2/+185
| | | | | | | | | | 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>
* Moving .qdoc files under examples/widgets/docGabriel de Dietrich2012-08-201302-1567/+1413
| | | | | | | | | | 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>
* Fix documented QMetaType::UserType value.Aaron McCarthy2012-08-201-1/+1
| | | | | | | | | 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>
* OpenGL: Use official glext.h and gl2ext.h headersSean Harmer2012-08-2018-1749/+13586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Take account of hidden items in QListView when using scrollTo.Stephen Kelly2012-08-202-3/+36
| | | | | | | Task-number: QTBUG-21804 Change-Id: I475166f3f60b1278089baa255ace4e18baeb568e Reviewed-by: Jani Honkonen <jani.honkonen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Replace deprecated ColorSync Manager use with updated CG APIJiang Jiang2012-08-201-9/+1
| | | | | | | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 01:48:42 +0000