summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Logging: Change arguments of message handler to avoid conversionsKai Koehne2012-04-208-94/+160
| | | | | | | | | | | | | | | Introduce a new QtMessageHandler that takes QString instead of char *: This avoids converting to local8bit , only to convert it back to utf16 for Windows. The old QMessageHandler is kept for a transition period, but will be removed before Qt 5.0. Also fix qEmergencyOut (that is called in OOM situations) to not rely on the default message handler. Change-Id: Iee0ce5838f97175c98788b847964273dd22d4a37 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove private classes in QEvent-derived classes.Thiago Macieira2012-04-193-150/+30
| | | | | | | | | | | QEventPrivate doesn't exist, so these classes were technically abusing the d pointer. Move the contents of the private classes into the main event classes. Change-Id: If2e894c1fa05f468221a0b43f3ebdf90769298eb Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add an assertion to deleteLater() before it modifies QEvent::dThiago Macieira2012-04-191-0/+6
| | | | | | | | | | | | | | | | The deferred deletion functionality stores the event loop level nesting count in the QEvent d pointer. In Qt 4, this d pointer was not usable because we forgot to add a proper copy constructor and assignment operator to it, so the deleteLater() process stored the count here safely. Since Qt 5 now has non-implicit copy methods, the d pointer could be used in the future. If QEvent uses it, this assertion will trigger. Note that it doesn't apply to classes derived from QEvent, though. Change-Id: I8600c8e9379921e32aca166bc0a6c0b4c4ed799f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Remove QVariant constructor taking Qt::GlobalColor.Jędrzej Nowacki2012-04-196-34/+7
| | | | | | | | The constructor is wrong, it creates instance of QVariant encapsulating a QColor instance. QVariant should not implicitly convert data, never. Change-Id: Idc794ecdecb42d8b53fee3f993bf51ddd43f595d Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* api: remove QWindow::visible()Girish Ramakrishnan2012-04-183-13/+2
| | | | | | | | | | | The correct api is QWindow::isVisible(). Removing the api is safe since QWindow is not even released yet. Only qtdeclarative needed to be fixed with 71c8fe296fe5aa7e79033dd8f5b539852d4276e0. Change-Id: Ie571ed4802fe89132419e402acdb854446f4578f Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* api: QGuiApplication::inputMethod should be staticGirish Ramakrishnan2012-04-182-6/+14
| | | | | | | | | Pretty much all methods in QGuiApplication are static. Also adds documentation. Change-Id: I96808dd266922432b92fe3962292e4d5b6a8ab46 Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
* Remove redundant check in QMetaType::typeInfoJędrzej Nowacki2012-04-181-2/+1
| | | | | | | The check was introduced when void was not a fully defined type. Change-Id: I4df8607999436f8db92be77fc8fd203fc66c2816 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove redundant checks in QVariant.Jędrzej Nowacki2012-04-181-6/+0
| | | | | | | QVariant and QMetaType have aligned type naming implementation. Change-Id: I9eaae1045c492c148e3e9d23f4e04d48272f7ec2 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Hide QTypeModuleInfo in a private namespace.Jędrzej Nowacki2012-04-184-18/+18
| | | | | | | The class is private and shouldn't pollute global namespace. Change-Id: Ib44473fd72e5a70096eeff1662e88b29263d19c6 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Skip tests toolbar-dialog/widget_window.Friedemann Kleint2012-04-172-0/+7
| | | | | | | | To enable merging the api_changes branch. Task-number: QTBUG-25331 Change-Id: I90d32ca0bd96eed62bae5f01316d6360a3b435c8 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Merge "Merge remote-tracking branch 'origin/master' into api_changes" into ↵Sergio Ahumada2012-04-17378-3780/+6339
|\ | | | | | | refs/staging/api_changes
| * Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-16378-3780/+6339
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/corelib/io/qurl.cpp src/gui/kernel/qwindow.cpp src/tools/moc/generator.cpp src/widgets/kernel/qwidget_qpa.cpp src/widgets/styles/qstyle.h src/widgets/widgets/qtabbar.cpp tests/auto/corelib/codecs/utf8/tst_utf8.cpp Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e
| | * qmenu.h includes private headersGirish Ramakrishnan2012-04-163-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | qpa includes are considered private and should not be included in public header files. Change-Id: I26c744ec1d8ddef7b0c11c3d26b593be05f5aa54 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Adding support for obtaining an OpenGL Core Profile context on Mac OSXSean Harmer2012-04-161-0/+12
| | | | | | | | | | | | | | | | | | | | | Change-Id: I08048ecee9b243b122ee93fce316e498aa7e2d51 Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| | * Fix incorrect state of show/hide menu items in Mac application menuPasi Matilainen2012-04-163-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Hide <app>", "Hide Others" and "Show All" menu items in Mac application menu are always enabled, and do not get disabled correctly. Fix by turning on autoenable for the menu in qt_menu.nib, and by implementing menu item validation in QCocoaMenuLoader. Task-number: QTBUG-10705 Change-Id: Ic181dfa26a71acad0067f5269c72517b50b17362 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> (cherry picked from commit 8f23a6be1069455e609e8bea7527726c24bebb36)
| | * Put bug numbers on same line as insignificant_test markers.Jason McDonald2012-04-169-16/+9
| | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to find insignificant tests that have no associated bug report. Change-Id: Ia71d59da062818d3860b0365d063e044705267fd Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| | * moc: Fix parsing of the empty preprocessor commandOlivier Goffart2012-04-162-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When encountering a null preprocessing directive (which is supposed to be ignored), the moc preprocessor will leave a PP_NEWLINE token in the token stream. That will confuse the parser. The PP_NEWLINE token need to be ignored in the preprocessing phase. Task-number: QTBUG-22717 Change-Id: I1e502a7e5bc6fa8ce2f82109ba7199b95747ff0a Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| | * widgets: Fix painting to a fully transparent top level widgetHolger Hans Peter Freyther2012-04-153-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QWS used to have a line to change the composite mode from SourceOver to Source for the top level widget. This wasn't used with QPA and I removed the internal DontSetCompositionMode in qtbase. It turns out that the QWS way is the most efficient one to initialize the background of the widget. The alternative is to have the QPlatformBackingStore::beginPaint always clear the entire to be painted area and then paint the background of the widget. The difference of painting each pixel once or twice is noticable on embedded platforms and in the range of one to two fps. Reproduce the issue with: echo "QWidget {background: transparent}" > style.css ./examples/widgets/wiggly/wiggly -stylesheet style.css Task-number: QTBUG-24526 Change-Id: Ica4c980bb3bf6eb87ddb5b510ac7493292d01543 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
| | * Now QSplitter can have 0-pixel handleABBAPOH2012-04-152-5/+5
| | | | | | | | | | | | | | | | | | Change-Id: Iad920ffcd5d7f4c01504d41d1740f130b7aa53dd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
| | * UCD-5.0: apply Corrigendum #6Konstantin Ritt2012-04-154-813/+824
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://unicode.org/versions/corrigendum6.html: > in Unicode 5.0, the list of characters with the Bidi_Mirrored property > was made consistent for brackets and quotation marks, in preparation for > new constraints on bidi mirroring. However, after publication of > Unicode 5.0.0 it was discovered that this change adversely affected > several quotation mark characters in deployed data. Task-number: QTBUG-25169 Change-Id: Id49caf401af2d5a1e6dbcc32b2f350aa20b7f901 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * Fixed broken logic in evdev input plugins.Samuel Rødal2012-04-153-29/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we do multiple reads we need to accumulate the total amount of bytes read, instead of just taking the last read amount into account. Change-Id: Iaa9b90c269f3ed9d09dae67452ca816d9db6217f Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
| | * Fold qpaintdevice_qpa.cpp into qpaintdevice.cppGirish Ramakrishnan2012-04-153-66/+16
| | | | | | | | | | | | | | | Change-Id: I274508826b9be4eb00f67fccae5a18ecbdf41a36 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Fix header inclusion guardGirish Ramakrishnan2012-04-151-3/+3
| | | | | | | | | | | | | | | Change-Id: Icc537d5b52315b9563078da9fa69ddd67b567f76 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * Fix tst_QMdiSubWindow::emittingOfSignals CI failuresGirish Ramakrishnan2012-04-141-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The test fails consistently on the CI (but never fails on any of the developer machines). This is possibly a timing issue. Change-Id: Ie40d9c38c3128a93898b0e50bfde5a754bd2b7fb Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| | * doc: QWindowSurface is deadGirish Ramakrishnan2012-04-142-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | It goes by the name of QBackingStore these days. Change-Id: Id46254e47ee0abf9e669862eec6c2205d9634368 Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * QDoc: add missing newline characters in qdoc -help.Casper van Donderen2012-04-141-2/+2
| | | | | | | | | | | | | | | Change-Id: Ibd50091693be393c6b479d6ca8927ba1ed578709 Reviewed-by: Martin Smith <martin.smith@nokia.com>
| | * qdoc: Fixed bugs causing invalid DITA XMLMartin Smith2012-04-145-155/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug in qdoc that caused too many end elements to be generated. Also fixed some doc errors that caused invalid DITA to be generated. Task nr: QTBUG-25302 Change-Id: Ifbbf457d28c51c2691a252888447739da7713bc9 Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Update accessibility selections in QTextControl.Frederik Gladhorn2012-04-142-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | Forwardport from Qt 4. Change-Id: Iae0c2792b64b8ec2736a9ff621cf7c313a394093 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> (cherry picked from commit d5649547d641b9c5af3c3f814caf8e1ab5bf9f47)
| | * Fix header inclusion guardsGirish Ramakrishnan2012-04-143-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | _QPA_ should only be used for qpa (plugin specific api) files. Change-Id: I1fb6cd5973fcabec4c7e87eb6ccb048f825e2aad Reviewed-by: Holger Freyther <holger+qt@freyther.de> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * QTBUG-1363: fix QSqlField.length() for ODBCMark Brand2012-04-132-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applied Bill King's suggestion in QTBUG-1363. Columns of hStmt must be accessed in order. Verified using ODBC driver on SQL Server 2005 on Windows 7. Added test for length of text field for MS SQL Server over ODBC. Task-Id: QTBUG-1363 Change-Id: I6673dafe75e3ef394d41e439adb45096c1421068 Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * Windows: Determine suitable font engine from application.Friedemann Kleint2012-04-131-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Freetype engine currently works better for QML2, whereas the native engine is better suited to the widgets. Task-number: QTBUG-24205 Change-Id: I76de98c3e7c84a2d72542ea9860b8be1e67f7e04 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
| | * Fix warnings in manual tests.Friedemann Kleint2012-04-136-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Constructor order. - Unused variables. - size_t -> int conversions. Change-Id: Ic5b016f41d01a4d8153ae0900b607bf946523c1d Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| | * Use QPointer to store accessible object.Frederik Gladhorn2012-04-132-83/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Itemview were not following the established pattern of keeping the referenced object in a QPointer. This made them a lot more crash prone. Port of Qt 4 change. Conflicts: src/plugins/accessible/widgets/itemviews.cpp src/plugins/accessible/widgets/itemviews.h Change-Id: I210b112b9c3647b246fde2d6c69aba9ce8d25bd3 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> (cherry picked from commit f420ab2870d3c96e9678c24c64b4e26ec8a771bd)
| | * doc: Fix QObject::connect documentationOlivier Goffart2012-04-133-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unfortunately, qdoc is too simple to understand any pointer to member function syntax. (the ::* token is not even tokenized. And even if it was, it would be a difficult way to hack that into the parser. (there is already an ugly workaround for non-member pointer to function hat works by having '(*' as a token,but the same hack is not possible for pointer to member function)) So I just put verbatim 'PointerToMemberFunction' Also remove the obsolete mention that Qt::UniqueConnection is not supported in that overload. It is now. (And it even contradicts the previous paragraph) Change-Id: I8fc9544808c9a462b0f11ccea406e2e33dee15b1 Reviewed-by: Geir Vattekar <geir.vattekar@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
| | * Move QPainterPathPrivate to the private header files.Gunnar Sletta2012-04-135-63/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was made inline for the sake of performance, but has in hindsight proven to be not really worth it. It also prevents us from aligning the internal datastructure of QPainterPath with that of QPolygonF and the internal QVectorPath class which would make mapping between the two inside QPainter a lot faster. Making all this out-of-line now as discussed in the task https://bugreports.qt-project.org/browse/QTBUG-19998 so we can adress this in a binary compatible fashion during Qt 5.x Change-Id: I61058171ed31f8a845fa45517248367c85ce52cd Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * directfb: Integrate building into configure.Holger Hans Peter Freyther2012-04-134-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add DirectFB buildsystem integration by adding a configure target and adding it as subdirectory to the project file. The default is to automatically build directfb. Update the Broadcom/9425 build. Change-Id: I482f865cebd9d5cd4c98c184773f8534f92db9df Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
| | * Minor cleanup of the header file.Jan-Arve Saether2012-04-132-70/+78
| | | | | | | | | | | | | | | | | | | | | | | | Move inline implementations to iaccessible2.cpp. Makes it easier to read and navigate the source code. Change-Id: I8da44ba0d40395356f612ff6b3ce2a808105838a Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| | * re-enable qabstractnetworkcache autotestShane Kearns2012-04-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have run the test 250 times in each of these configs with no crashes observed, so assuming the instability has been fixed by another change. ubuntu 11.10 64 bit ubuntu 10.04 32 bit windows 7 msvc2010 64 bit (debug) windows 7 msvc2010 32 bit (release) Task-number: QTBUG-20686 Change-Id: I02bab165c263cf79684c7723eae1e278839b1e37 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| | * QRegularExpression: add more test dataGiuseppe D'Angelo2012-04-131-0/+111
| | | | | | | | | | | | | | | | | | Change-Id: I44d19f976ced7b073f66d0ea943fafea37940c48 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| | * Windows QPA plugin: Fix logging.Friedemann Kleint2012-04-133-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | - Remove frequently occurring messages. - Rename variable to QT_QPA_VERBOSE. Change-Id: Id930e1422675355a9657edae6505be87aaec98a5 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * test: Don't mark tst_qscrollbar as insignificant on Mac OS XSergio Ahumada2012-04-132-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Just XFAIL the failing test instead of ignoring the whole test. Task-number: QTBUG-25272 Change-Id: Iedca9913032f13c6610b049a0313c9e4336216e0 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| | * replace hardcoded values with a surrogate handling methodsKonstantin Ritt2012-04-138-27/+29
| | | | | | | | | | | | | | | | | | Change-Id: Ib41e08d835f2e8ca2e32b4025c6f5a99840f2e27 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * Merge the two overloads of QButtonGroup::addButton().Jason McDonald2012-04-133-23/+7
| | | | | | | | | | | | | | | | | | | | | | | | This change is source-compatible, but binary-incompatible. Task-number: QTBUG-25101 Change-Id: If67aec2ca8dd54ad9315f6497c2dafbbbc0b775f Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| | * Fix unsigned comparison warning.Stephen Kelly2012-04-131-1/+1
| | | | | | | | | | | | | | | Change-Id: I8544f47177b68cf29ce9fbebb152ca73db6e219d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
| | * Fix compiling with XCode 4.3Aron Rosenberg2012-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XCode 4.3 moved the location of the SDK dir, so change the qmake test to not use the old hardcoded location. Also change the test to look for versions before 10.6 instead of later than 10.6 so 10.8+ gets detected correctly. Change-Id: I1cb53a18c4b4f484d0d9de9c9d5e9641018f2502 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| | * QChar: documentation fixesKonstantin Ritt2012-04-131-1/+18
| | | | | | | | | | | | | | | | | | Change-Id: Ic4b58ab811e53cf175ebaf0a67c40c56678f0f35 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * Fix wrong casing in include of qcocoaclipboard.hTor Arne Vestbø2012-04-130-0/+0
| | | | | | | | | | | | | | | Change-Id: Ib8294849d07abdf957a03ce0cb67c533905247a7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| | * Added iOS compatibility.Qt4iOS2012-04-131-11/+11
| | | | | | | | | | | | | | | | | | | | | Put MacOS-specific code in #ifdef blocks to disable compilation on iOS. Change-Id: I02c99c62b8ceb468b8b58e3c4ef52ca8ae2495f1 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| | * Added iOS compatibility.Qt4iOS2012-04-134-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Put MacOS-specific code in #ifdef blocks so that it is not compiled for iOS. Add iOS implementation for MacOS-specific code, where possible. Change-Id: I3664c76fcfa8d5497ad1db676b9331e4ae0dca0e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
| | * Added iOS compatibility.Qt4iOS2012-04-131-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified OpenGL header inclusion block to support iOS GL include paths. Removed ability to build for MacOS with GLES2, as no support on MacOS for OpenGLES. Change-Id: I2bcf302278545147632b23a86380fa3980ec10a4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 12:52:51 +0000