summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-04-16224-3390/+4995
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * moc: Fix parsing of the empty preprocessor commandOlivier Goffart2012-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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-151-788/+789
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * 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-141-3/+17
| | | | | | | | | | | | | | | | 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-131-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * 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-132-9/+9
| | | | | | | | | | | | | | | | | | 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>
| * 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>
| * replace hardcoded values with a surrogate handling methodsKonstantin Ritt2012-04-137-24/+26
| | | | | | | | | | | | 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>
| * 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>
| * Added iOS compatibility.Qt4iOS2012-04-132-4/+6
| | | | | | | | | | | | | | Put MacOS-specific code into #ifdef blocks to enable compilation on iOS. Change-Id: I0bb3846f457d1b3a56d99fe182b1718bc8429117 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * QDoc: Fix infinite loop when finding items in ditamaps.Casper van Donderen2012-04-131-1/+2
| | | | | | | | | | Change-Id: Ic033676e21a252db07543fccba0d2a41f4b52294 Reviewed-by: Martin Smith <martin.smith@nokia.com>
| * Prevent warning when using QPainter on a QGLWidget.Samuel Rødal2012-04-131-2/+1
| | | | | | | | | | | | | | | | Prevents warning "QOpenGLContext::swapBuffers() called without corresponding makeCurrent()". Change-Id: I7e4f94df8654f899c25b3f41cbf4d007ca293f16 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Implement modality in the Windows plugin.Friedemann Kleint2012-04-133-1/+76
| | | | | | | | | | | | | | | | Disable blocked windows and flash the active window if a blocked one is activated (as in Qt 4). Change-Id: I6b6d230f94a271ce2aa649e3f4e13ebd63e93da4 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * __builtin_unreachable was added to GCC in version 4.5, so fix macrosThiago Macieira2012-04-131-2/+4
| | | | | | | | | | Change-Id: Ida63bb46f696ae9d60331d863bf1478415a08ff2 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Use the new udev based framework for detecting graphics cards.Hannu Lyytinen2012-04-135-17/+157
| | | | | | | | | | | | | | | | Get rid of hard coded device node and support any number of graphics cards. Change-Id: I50f07fb1e6ea321a4ae751db8fb49ab439dce51e Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
| * Implement basic bits for device autodetection via udev.Hannu Lyytinen2012-04-135-3/+305
| | | | | | | | | | | | | | | | | | The graphics cards and eventually the input devices need to be resolved via udev. This commit adds a listener class and an abstract base class for writing device specific handlers. Change-Id: I62784c98bc7ad4bc1431d61cd5f13c8b48edf330 Reviewed-by: Andy Nichols <andy.nichols@nokia.com>
| * device: Introduce hooks for the directfb plugin and use themHolger Hans Peter Freyther2012-04-135-4/+151
| | | | | | | | | | | | | | | | | | The EGL integration is vendor specific, add platform hooks to the DirectFB plugin and implement them for the Broadcom 97425. The hook interface is internal and there are no ABI/API gurantees. Change-Id: I33359830c51f16895e771837fccb71e03c81cf18 Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
| * moc: fix compilation of signals returning pointers.Olivier Goffart2012-04-131-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That was a regression introduced in 1c5db1aff Example: signals: int *someSignal(); would produce this code: int* _t0 = int*(); which does not compile So have special handling for pointer to change it to '= 0' Change-Id: Ie695e15e309d15c3cfd5c5a69ac8bf6d61ae9915 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| * Remove Q_CORE_EXPORT from the simple QFlag and QIncompatibleFlagThiago Macieira2012-04-131-2/+2
| | | | | | | | | | Change-Id: I0302238e817fc7d3b4682c5cc4f9cb51d181a7d2 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Move QFlags to qflags.hThiago Macieira2012-04-133-86/+142
| | | | | | | | | | | | | | This is a verbatim copy of the source code. Change-Id: I1f7efc75cad1ba05dda31d8ccfd091ae9ae40fd5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * Fix compiler warning in evdevmouse plugin.Friedemann Kleint2012-04-131-1/+3
| | | | | | | | | | Change-Id: I3b203b485079ff2cc96044789b06525ab2cde448 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Fix MinGW warning about qDebug() formats.Friedemann Kleint2012-04-131-1/+1
| | | | | | | | | | Change-Id: I927d17240a7cc7b88814601b0711aa46ca166ff9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * Apply Qt config option "-no-largefile" to SQLite make processSergey Gusarov2012-04-121-0/+1
| | | | | | | | | | | | | | | | | | This patch fixes compilation error if there is no 64 bit support in compiler. Task-number: QTBUG-15395 Change-Id: Ife4afb05491d36af93bf4ad3ba8fa227710655f0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * fixed compiling of QDnsRunner for wince and windows desktopBjoern Breitmeyer2012-04-121-8/+9
| | | | | | | | | | | | | | | | | | | | ce only has the utf16 variant desktop has all variants of the DnsQuery call. Unified it to the utf16 variant. Change-Id: Ic126c3f53da71c85a41a5c24c85970335700bcf0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| * Fix autotest failures in QAbstractNetworkCacheShane Kearns2012-04-121-58/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache expiration calculation was previously removed to avoid calculating it every time an object is fetched from the cache. This is because the expiration date is calculated from max-age or expires headers when the object is added to the cache. However this broke the case where the server only provides a last-modified header. In this case, the expiration date needs to be checked at fetch time in order to add the warning if the object is >24h old. Change-Id: Iad381da0f91c27ac603abbaa94f268700ad2297f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Add OS version detection for windows 8Shane Kearns2012-04-122-0/+6
| | | | | | | | | | | | | | Based on consumer preview, the internal version is 6.2 Change-Id: I9d6ff6c7614f46a20d489e8a8f4aefeb60c547f6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix possible crash issue when testing the state of a QAccessibleMenuItemYan Shapochnik2012-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | The owner widget of a QAccessibleMenuItem may be NULL. Checking for a valid pointer before dereferncing. Port of Qt 4 patch. Change-Id: Ic3149ccc5d6ae0ebc83dae58163ae2f60397fd28 (cherry picked from commit 3f526366af14f6c640dd52cd089b00776ab06731) Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 01:49:37 +0000