summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Compile on MacEskil Abrahamsen Blomfeldt2011-05-101-2/+2
| | | | | | | Missing API update in Q_WS_MAC block Reviewed-by: Jiang Jiang (cherry picked from commit 4b95d9939db75d7bd55db4bbbf2d67af459f7eb5)
* Avoided calling updateAccessibility() from updateMicroFocus if the item was ↵Jan-Arve Sæther2011-05-101-2/+4
| | | | | | | | | | | | | | | hidden This had the following negative effect in qmlviewer: - Every time the qmlviewer logged something to its QPlainTextEdit (regardless of if it was visible or not) it would call updateMicroFocus (because appending to QPlainTextEdit would move the cursor). The result was that the AT client got overloaded with accessibility state changes, and response time got really bad. (cherry picked from commit ad50e45311cce712fbe35641cde973d616ff560d) Reviewed-by: Frederik Gladhorn (cherry picked from commit a825b3a9e6132842090e43fae85d2c6c61b2def6)
* Notify a11y framework of FocusChanges for QGraphicsObjectJan-Arve Sæther2011-05-101-0/+12
| | | | | | | (cherry picked from commit 1b5cb7865eb8b48a2721f9b9c3ccd2fb25f8175d) Reviewed-by: Frederik Gladhorn (cherry picked from commit 9a02ad74693f1835745ec20798b353f7e62bcd5e)
* Call updateAccessibility on the QGraphicsObject in updateMicroFocusJan-Arve Sæther2011-05-101-6/+10
| | | | | | | | | Since QGraphicsObjects now can be in the a11y hierarchy, we should treat them just like we treat widgets. (cherry picked from commit 860745a4713b29857d14571572504da71a2ca077) Reviewed-by: Frederik Gladhorn (cherry picked from commit 4687938fd03ed65306039af6b4e5e192ec8bf491)
* Fix updateAccessibility for QGraphicsObjectsJan-Arve Sæther2011-05-101-1/+123
| | | | | | | | | If updateAccessibility is called on a QGraphicsObject, walk up and find the closest ancestor widget with a HWND. (cherry picked from commit d4291591dfb6a7b1f5c7d00879e8162e84d9ab1b) Reviewed-by: Frederik Gladhorn (cherry picked from commit 96406a7dd609e75340f7b4a05726c60c197786b8)
* Make accessibility work on Windows with alienJan-Arve Sæther2011-05-101-13/+113
| | | | | | | | | | This means that there will be no implicit conversion to windows handles anymore! Enabler for making QML accessible on windows. (cherry picked from commit a3ac7deb5dfe48c5fdd0e170c20b6852c3bb41de) Reviewed-by: Frederik Gladhorn (cherry picked from commit d289e54f2d2aa066cb383d8c8249bd7594bdf7b0)
* Rename QGlyphs -> QGlyphRunEskil Abrahamsen Blomfeldt2011-05-1012-134/+135
| | | | | | | | | | | API clean-up for QGlyphRun: 1. QGlyphs -> QGlyphRun 2. QGlyphRun's font()/setFont() -> rawFont()/setRawFont() 3. QPainter::drawGlyphs() -> drawGlyphRun() 4. QTextLayout and QTextFragment's glyphs() -> glyphRuns() Reviewed-by: Jiang Jiang (cherry picked from commit 84ef364302728b68d2d29ea9c4ccbec32c7bb115)
* Add internal documentation for QUnifiedToolbarSurface.Fabien Freling2011-05-101-0/+33
| | | | | | | | | This document is aimed for developers. This is why it is directly written in the header file. This is not part of the public API. Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 891b6ac7236d21b69bdb54b00051422cee004059)
* Change the repaint() call to an update().Fabien Freling2011-05-101-2/+2
| | | | | | | | | | In show_sys(), if we directly call repaint() this will triggers too many UpdateRequest events. This fixes the qwidget autotest "compatibilityChildInsertedEvents". Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 747962e6ec20a59b7e2ed67c5cd685258f199a86)
* Change the repaint() to an update().Fabien Freling2011-05-101-4/+4
| | | | | | | | | Forcing to repaint might cause a recursive repaint. Since there is no apparent reason to directly repaint, we just call update(). Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 244fedd484b022881b906b1bc794d5af19d02843)
* Set the default graphics system to raster.Fabien Freling2011-05-101-1/+1
| | | | | | | This change is specific to Mac OS X/Cocoa. Reviewed-by: Lars Knoll (cherry picked from commit 2c2026df66f237b7313397dd74f6bc3212b94596)
* Revert "Switch the default graphics system to raster on Mac."Fabien Freling2011-05-101-1/+1
| | | | | | | | This reverts commit a5d40fd3814ab7c8e865912c03a918bfd5994998. We have to fix the regressions due to the raster engine before putting it by default. (cherry picked from commit 3197fe2af911673c6291db0102e90a0d7f6ae926)
* Fix a race condition when the main window is being destructed.Fabien Freling2011-05-102-1/+3
| | | | | | | | | | During the destructor of QWidget, we delete the layout. If the layout is not set to 0 afterwards, a check on the layout might turn true, but any access will end with a segfault. Reviewed-by: João Abecasis (cherry picked from commit abc5a632942c23496d75c49b3b0b4a674cdafdf8)
* Switch the default graphics system to raster on Mac.Fabien Freling2011-05-101-1/+1
| | | | | Reviewed-by: Lars Knoll (cherry picked from commit a5d40fd3814ab7c8e865912c03a918bfd5994998)
* Remove const from QPlatformClipboard::mimeData().Laszlo Agocs2011-05-106-11/+9
| | | | | Most implementations will anyway do non-const operations in there, the change avoids the need for const_cast or mutable.
* Retrieve the actual data in the Wayland clipboard only when requested.Laszlo Agocs2011-05-102-23/+69
|
* Fix QDefaultAnimationDriverAlan Alpert2011-05-102-4/+7
| | | | | | | Animation drivers were changed to used signals instead of virtual functions, but the default animation driver was left behind. Reviewed-by: Michael Brasser
* Turned on private headers for some plugins.Jonni Rainisto2011-05-092-0/+4
| | | | Reviewed-by: axis
* Added Wayland selection support.Laszlo Agocs2011-05-0913-3/+367
|
* Add qglobal.h exports for QtLocation & QtSensorsAlex2011-05-091-20/+46
| | | | | | Plus the QtLocation configure options Reviewed-By: Lincoln Ramsay <lincoln.ramsay@nokia.com>
* Install private headers into the correct locationMarius Storm-Olsen2011-05-071-1/+1
| | | | | | The privates need to be under <MODULE NAME>/ since we use #include <ModuleName/private/header_p.h> in many places
* Fix QRawFont::setPixelSize() on MacEskil Abrahamsen Blomfeldt2011-05-061-1/+1
| | | | | | | | | When refactoring the setPixelSize() code of QRawFont, it was broken on Mac. To avoid making the same mistake again, I've added a simple autotest to check that the pixel size is actually set. Reviewed-by: Jiang Jiang (cherry picked from commit 821b8b540af491ce60d35bd84d3c91399ecc0d16)
* Fix QPainter::drawGlyphs() with non-affine transformationEskil Abrahamsen Blomfeldt2011-05-061-1/+8
| | | | | | | | | | | | | When the matrix has an non-affine transformation, the text will have to be rendered using the default path-renderer. This means going through the drawTextItem() path (since drawStaticText() has no support for those transformations) and it also means not pre-transforming the coordinates, since the default implementation of drawTextItem() supports transformations. Task-number: QTBUG-18214 Reviewed-by: Jiang Jiang (cherry picked from commit 55446d104db77fc7994ab12352b1c08bb7b63346)
* uic: Remove Q3Support.Friedemann Kleint2011-05-064-431/+15
| | | | Remove code and tests.
* Dont do doneCurrent in swapBuffersJørgen Lind2011-05-051-1/+0
|
* compile openvg with private headersMarius Storm-Olsen2011-05-051-2/+2
|
* Only enable design metrics for scalable fontsJiang Jiang2011-05-051-1/+1
| | | | | | | Bitmap fonts don't have linear advance at all. Reviewed-by: Eskil (cherry picked from commit 111accbf9aaf95b052448ecb70937c61e9b59d66)
* Add a way to retrieve CTFontRef from QFontJiang Jiang2011-05-052-3/+6
| | | | | | | | | Since macFontID restricts to quint32, we have to return that in QFont::handle. Task-number: QTBUG-17890 Reviewed-by: Eskil (cherry picked from commit c8f299b7e675c839b16d750cd2633a57cdd0526f)
* Add Q_UNIMPLEMENTED() macroKent Hansen2011-05-041-0/+4
| | | | (cherry picked from commit adce00979c30cc22d26ba43c15e0c7a3733b57ab)
* Fix build error on MacPrasanth Ullattil2011-05-041-1/+1
| | | | | | | To use the private headers, the .pro file should contain QT += <module>-private Reviewed-by: Olivier Goffart
* Build fixPaul Olav Tvete2011-05-041-0/+1
|
* BC cleanup in uitools.Friedemann Kleint2011-05-041-1/+1
| | | | | | | | | Remove virtual functions obsoleted by new resource handling in Qt Designer 4.4. Remove static hash of private objects for formbuilder. Requires fd61c9b24d27452df3eb478a81d7e7725fe6f5b4 in qttools. Rubber-stamped-by: axis
* Remove QFontEngineFT::loadGlyphMetricsJiang Jiang2011-05-042-101/+0
| | | | | | | It is no longer used and was accidentally merged back in. Reviewed-by: Eskil (cherry picked from commit 782535ac548c582542bd1c17207e288e816870a8)
* Add required font metrics functions to QRawFontJiang Jiang2011-05-042-0/+56
| | | | | Reviewed-by: Eskil (cherry picked from commit 2c8df8bfb679885c3cbd2ee02f5e4053fdd554c2)
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-041-0/+8
|\
| * Include pixel size of font in exported HTML from QTextDocumentEskil Abrahamsen Blomfeldt2011-05-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | When you copy-pasted rich text in which the font size had been set using setPixelSize() the font size would be mysteriously forgotten. The pixel size property in QTextCharFormat was added ad hoc, and not integrated in the HTML exporter. Task-number: QT-4792 Reviewed-by: Gunnar (cherry picked from commit 5aa5c2e2935c1829cc6965198968699f17c24ec0)
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-stagingGunnar Sletta2011-05-0438-85/+145
|\|
| * Move private headers into versioned subdirectoryMarius Storm-Olsen2011-05-0230-76/+87
| | | | | | | | | | | | | | This will allow us to expose private headers in a controlled manner, and ensure that they are not used by accident. This also means that we internally will have to enable the private headers for the modules we wish to use in the project.
| * Add module.prf, and install MODULE_PRI for each moduleMarius Storm-Olsen2011-05-0210-5/+41
| | | | | | | | Output warning if not present
| * QNetworkConfigurationManager: Fix network polling.Martin Petersson2011-05-022-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | startPolling() is called by each engine, so before it would start multiple singleshot timers. So I moved the timer to the class and check if it has already been started before it is activated again. So that we just use one timer. Task-number: QTBUG-17219 Reviewed-by: Iiro Kause Reviewed-by: Kranthi Kuntala (cherry picked from commit 2506b86828ca8140c2f22d85a4378df40899b132)
| * QAbstractSocket: Fix waitForReadyRead infinite loop.Martin Petersson2011-05-021-2/+2
| | | | | | | | | | | | | | | | Make sure that waitForReadyRead times out if the read buffer is full. Task-number: QTBUG-16123 Reviewed-by: Peter Hartmann (cherry picked from commit 8d4cd52b6981a4e6deea7fdb77f56e40c4f3e6ba)
| * Fix compile warning on WindowsMartin Petersson2011-05-021-0/+1
| | | | | | | | | | Reviewed-by: Prasanth Ullattil (cherry picked from commit 800ad68e4f000e65b0a83ef1da2a29d595964156)
* | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtbase-staging into ↵Gunnar Sletta2011-05-0430-144/+224
|\ \ | | | | | | | | | qtquick2
| * | Compile on WindowsEskil Abrahamsen Blomfeldt2011-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The SPI_FONTSMOOTHINGCONTRAST macro is not defined everywhere. When the code was refactored, the workaround for this was lost. This resubmits the work-around to make it compile. Reviewed-by: Samuel (cherry picked from commit 4c3630c1fcd2b3008f540a8906a19c533604f36a)
| * | Remove warningsJørgen Lind2011-05-043-1/+3
| | | | | | | | | | | | (cherry picked from commit 9625c564877414695a9706acf34bc8719018ef06)
| * | Fix Wayland plugin so it works with the wayland bind apiJørgen Lind2011-05-045-50/+26
| | | | | | | | | | | | | | | | | | This is mostly for the xcomposite api, but also we needed to readEvents after doing a connect (cherry picked from commit 16c054125949b8f8ceec9626156d8790254a63a2)
| * | wayland: Track wayland changesKristian Høgsberg2011-05-045-21/+12
| | | | | | | | | | | | | | | | | | Pass version number when creating proxies, use wl_ prefix when looking up interfaces and drop wl_egl_display. (cherry picked from commit c2adf9395214d711a3a40516c6c2afa64b3b4ca3)
| * | Support GL ES 2 with uikit.con2011-05-046-43/+101
| | | | | | | | | | | | | | | | | | | | | For GL ES 2 teach the paint device about the fact that it is doing rendering backed by a framebuffer object, not a system framebuffer (which doesn't exist). (cherry picked from commit 3b437a7706efbaaafdc4861393cbe21354cf4ee2)
| * | Lighthouse: Fix virtual desktopwidgetJørgen Lind2011-05-042-9/+4
| | | | | | | | | | | | (cherry picked from commit 69c759f5b84c2f6a44377e5f72cfe9d5bf7344c6)
| * | Support gamma correction of text on GLEskil Abrahamsen Blomfeldt2011-05-036-12/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the SRGB framebuffer extension in GL is available, we can support gamma correction of text with a gamma of 2.1. On Mac this is sufficient for gamma correcting subpixel antialiased text. Gray antialiasing should not be gamma corrected on Mac. On Windows, the user can potentially set the gamma value to anything between 1.0 and 2.2 (or something like that). We support anything that resembles 1.0 closely enough by pushing the text out without any correction (like before). We also support anything that resembles 2.1 (the gamma hardcoded in GL's SRGB extension) by turning on the extension before blending the text. In between the two, we'll use gray antialiasing to avoid differing too much from the raster engine (which is our reference in this.) For gray antialiasing on Windows, we use a constant gamma of 2.3 which has been determined by experimentation. Since this is close enough to 2.1 we do gamma correction with SRGB extension. The distance limit of 0.2 is determined by some experimentation. Reviewed-by: Samuel (cherry picked from commit 79ba7cceca5e4029876ace2121edd25b08ae14ce)