summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mac: build fixRichard Moe Gustavsen2011-08-023-5/+12
| | | | | | | | | | | qtbase failed building on Mac OS 10.5 and 10.6. This patch just rearrange some headers etc Change-Id: If85ac69029533a195249e84f8803ced6c0ff22b6 Reviewed-on: http://codereview.qt.nokia.com/2517 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Bring back QPixmap::grabWidget() (with a warning).Friedemann Kleint2011-08-014-31/+65
| | | | | | | Change-Id: I8bbf07da474bc3ab35980b25c41c2fc4c02e8896 Reviewed-on: http://codereview.qt.nokia.com/2394 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Compilation of tst_qwidget.cpp.Friedemann Kleint2011-07-291-1/+19
| | | | | | | Change-Id: Id1af7f98e1ef615f31e3512b57d727eda8b91f1f Reviewed-on: http://codereview.qt.nokia.com/2401 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix compilation of Minimalplugin, add documentation.Friedemann Kleint2011-07-293-12/+24
| | | | | | | Change-Id: I3b40eed781905610cc3062d25dcccf5f760de1f0 Reviewed-on: http://codereview.qt.nokia.com/2382 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Make QPlatformIntegration not have a factory for eventdispatcherJørgen Lind2011-07-2815-57/+54
| | | | | | | | | but rather an accessor for the guiThreadEventDispatcher Change-Id: I1b9ba14efc9f338c5a67e3e24ddb0caf76c07413 Reviewed-on: http://codereview.qt.nokia.com/2321 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Initial OpenWFD supportJørgen Lind2011-07-2724-0/+2344
| | | | | | | Change-Id: I06f71073ec58af1a431edb997f3a359800320196 Reviewed-on: http://codereview.qt.nokia.com/2288 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make it possible to use QSocketNotifier in Lighthouse pluginsJørgen Lind2011-07-272-4/+18
| | | | | | | | | | | | | The idea is that now the plugin can register the event dispatcher in its constructor, so it can freely use QSocketNotifier or what not. If the plugin choses not to do so, then the createFunction will be called at a later point. Change-Id: I75fb2ee4180d9619ac94e75fbcf1efd7a2deecbc Reviewed-on: http://codereview.qt.nokia.com/2287 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* More graceful choosing of EGL configs.Samuel Rødal2011-07-271-11/+18
| | | | | | | | | | | | If someone asks for a depth buffer of size 32, we should try to give them a smaller depth buffer if none of that size is available. Also, don't unconditionally read the alpha size of the configure attributes, since it might have been removed when reducing the config. Change-Id: If2f9d49c1cc3ded015384f9551b19cd15c523ce3 Reviewed-on: http://codereview.qt.nokia.com/2269 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Added Q_GUI_EXPORT for some internal symbols needed in QtWidgets.Samuel Rødal2011-07-273-6/+6
| | | | | | | Change-Id: I1e3ba974ebb1200095ddd32a905acaab3cea1c1e Reviewed-on: http://codereview.qt.nokia.com/2207 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Remove nativeimagehandleprovider.Samuel Rødal2011-07-277-809/+3
| | | | | | | | | Symbian / OpenVG are currently not supported in Qt 5. Change-Id: I0a0e1dd9ac3f48c62c0e30baa4d32a087c15a766 Reviewed-on: http://codereview.qt.nokia.com/2194 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* QWindow: Do not call setters for window state, type etc in creation.Friedemann Kleint2011-07-262-51/+18
| | | | | | | | | | | | | | Remove the need to do housekeeping and comparison of window types, etc in the platform window setters. They can safely assume the flags have really changed and something (potentially recreating the window) has to be done. createPlatformWindow() must then query all parameters from QWindow and apply them. Change-Id: I497060ba46a955cad1fa3cbb5eb91438a420b80e Reviewed-on: http://codereview.qt.nokia.com/2198 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Compile fix for QImage autotest.Samuel Rødal2011-07-261-1/+1
| | | | | | | | | | QImage::numBytes() is deprecated, QImage::byteCount() should be used instead. Change-Id: I0f885b91a49de59eb371da931bb64d2d57fcc0d0 Reviewed-on: http://codereview.qt.nokia.com/2177 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Get the eglfs plugin compiling.Samuel Rødal2011-07-2615-98/+145
| | | | | | | Change-Id: I5addb1a2593a670d559b9fbf9183f52af410895b Reviewed-on: http://codereview.qt.nokia.com/2176 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Set an object name matching the Widget on QWidgetWindow.Friedemann Kleint2011-07-261-0/+12
| | | | | | | | | | To aid debugging. Change-Id: I841a59a60a0de504eef140debc5e55ee5f15d7f7 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/2167 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Retrieve QPlatformScreen from top level when querying widget metrics.Friedemann Kleint2011-07-261-1/+9
| | | | | | | | | | Check for 0 and use primary screen as default. Change-Id: Ib4d0d3f507e7fb17687f5e126b49f98cfdbead6c Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/2166 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix MSVC compiler warning.Friedemann Kleint2011-07-261-1/+2
| | | | | | | | | class/struct mismatch. Change-Id: Ifaecc4ba4baeceb41fffba84678466faf48469bc Reviewed-on: http://codereview.qt.nokia.com/2156 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Lighthouse: Provide default plugin.Friedemann Kleint2011-07-251-4/+21
| | | | | | | | | Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Change-Id: I13e78c499f77ac6ad034e61488fc6ef00e2e2be8 Reviewed-on: http://codereview.qt.nokia.com/2124 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Compile fix.Friedemann Kleint2011-07-251-0/+1
| | | | | | Change-Id: I8eef93e05ef4938111d2fb21c2ade019b578ab11 Reviewed-on: http://codereview.qt.nokia.com/2123 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Compile fix.Friedemann Kleint2011-07-251-2/+5
| | | | | | | Change-Id: Iab8abc6ebd580f8bafc08b250244e72907c253f4 Reviewed-on: http://codereview.qt.nokia.com/2122 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Compile fix.Samuel Rødal2011-07-251-0/+212
| | | | | | | | | Added missing qscreen.cpp. Change-Id: Id79a6a12aca0758fdb1a168d63969940111f03dd Reviewed-on: http://codereview.qt.nokia.com/2119 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Drag and drop support in Wayland plug-in.Laszlo Agocs2011-07-257-2/+525
| | | | | | | Change-Id: I5e4448a9b3d3df9e3a12733386079031be340a42 Reviewed-on: http://codereview.qt.nokia.com/2101 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add drag and drop events to QWindowSystemInterface.Laszlo Agocs2011-07-254-0/+65
| | | | | | | | | | | For non-desktop platforms these are better suited and are more QPA style than relying purely on QDragManager/QSimpleDrag/sending drag events directly to the windows. Change-Id: Id466830cf83427b3d86925602086a858e8f713e5 Reviewed-on: http://codereview.qt.nokia.com/2084 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Pixmap cursor support in QWaylandCursor.Laszlo Agocs2011-07-252-15/+64
| | | | | | | Change-Id: I7075229584e9705fae63679b5512c11fd8535797 Reviewed-on: http://codereview.qt.nokia.com/2100 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Support non-desktop platforms better with QDragManager.Laszlo Agocs2011-07-252-0/+21
| | | | | | | | | | | | | | By default QDragManager brings in a number of "desktopisms" (e.g. that a drag is always controlled by mouse events, can be cancelled with some key press, etc.), these assumptions are not necessarily suitable for all QPA platforms. Therefore there has to be a way to disable this built-in event handling, and let the QPlaformDrag decide how the drag is controlled and when it ends. Change-Id: Ie9fa2df7ba1e30dd1c6e2cff406490e36be73c4f Reviewed-on: http://codereview.qt.nokia.com/2085 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix for not calling QPlatformCursor's pointerEvent.Laszlo Agocs2011-07-251-0/+9
| | | | | | | | | | The code to pass mouse events to platform cursors is there in 4.8, however it went missing in refactor. This patch restores it. Change-Id: I7873c892c1ae907fc084d3f00f7d4e5a6293ba4d Reviewed-on: http://codereview.qt.nokia.com/2083 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Added workable QScreen API on top of QPlatformScreen.Samuel Rødal2011-07-2550-364/+673
| | | | | | | | | | | | | | | | | | | | | QPlatformIntegration::screens() no longer has to be implemented, implementations should call QPlatformIntegration::screenAdded() for each screen instead. This is for being able to support adding screens at run-time later on, by connecting it to a signal in QGuiApplication. The QGuiGLContext API has changed a bit, by not sending in all the parameters in the constructor but instead having a create() function. The createPlatformGLContext() factory in QPlatformIntegration takes a QGuiGLContext * instead of a QSurfaceFormat and a share context, similar to how the window and backing store factory functions work. The XCB plugin has experimental support for connecting to multiple X displays simultaneously, creating one or more QScreen for each. Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f Reviewed-on: http://codereview.qt.nokia.com/2103 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Build fix for examples.Friedemann Kleint2011-07-252-8/+1
| | | | | | | | | Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Change-Id: I36f5a4088a39673a8e74a4d53ac83a42696af096 Reviewed-on: http://codereview.qt.nokia.com/2095 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Handle failed SHM attach in XCB backing store.Samuel Rødal2011-07-211-15/+39
| | | | | | | Change-Id: I5f97c0c6030d13b68cfc17d19ba969cd78f79c3f Reviewed-on: http://codereview.qt.nokia.com/1943 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* Merge remote branch 'gerrit/master' into refactorSamuel Rødal2011-07-21261-23926/+43804
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/opengl/cube/main.cpp examples/widgets/applicationicon/main.cpp examples/widgets/orientation/main.cpp src/gui/image/qicon.cpp src/gui/image/qimage.h src/gui/image/qpixmap.h src/gui/image/qpixmap_mac.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qpalette.cpp src/gui/kernel/qwidget.cpp src/gui/styles/qmacstyle_mac.mm src/gui/widgets/qmenubar.cpp src/gui/widgets/qslider.cpp src/opengl/qwindowsurface_gl.cpp tests/auto/qvariant/qvariant.pro tests/benchmarks/corelib/kernel/qobject/qobject.pro tests/benchmarks/gui/animation/qanimation/qanimation.pro tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro tests/benchmarks/gui/image/qimagereader/qimagereader.pro tests/benchmarks/gui/itemviews/qtableview/qtableview.pro tests/benchmarks/gui/kernel/qapplication/qapplication.pro tests/benchmarks/gui/kernel/qwidget/qwidget.pro tests/benchmarks/gui/painting/qpainter/qpainter.pro tests/benchmarks/gui/painting/qtbench/qtbench.pro tests/benchmarks/gui/painting/qtracebench/qtracebench.pro tests/benchmarks/gui/text/qtext/qtext.pro Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
| * minor improvements to QChar documentationRitt Konstantin2011-07-211-68/+42
| | | | | | | | | | | | | | | | | | | | Merge-request: 22 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Change-Id: Ib70922f98385888c084ccd3224a9bb12ca766ccf Reviewed-on: http://codereview.qt.nokia.com/1926 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Fix more use of C style cast.Olivier Goffart2011-07-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | Commit 77ed8787ac9ef0f74c2ab6699af3fec434e433e5 was not enough Fix the test tst_Moc::oldStyleCasts() Change-Id: Ia2f98f4e02ba512c3f7fd7cd09b692a1aabd8de0 Reviewed-on: http://codereview.qt.nokia.com/1927 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fixed clipping errors for non-extended paint engines.Samuel Rødal2011-07-211-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially revert change a33ef62469fd71bec for the non-extended paint engine path. Task-number: QTBUG-19525 Reviewed-by: Andy Shaw (cherry picked from commit f370dd07560c449ba17d13475721f7d3b46e6b24) Change-Id: I19eaaa265a54b2df65a8ec73e36fbdf58b1a4334 Reviewed-on: http://codereview.qt.nokia.com/1211 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Doc: Removed documentation for deleted code.David Boddie2011-07-2132-2129/+0
| | | | | | | | | | | | | | Change-Id: Icdbc05decac3dfe3fc18ce073c494e1fce4ea347 Reviewed-on: http://codereview.qt.nokia.com/1824 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Doc: Speculative attempt to fix build breakage.David Boddie2011-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | Case sensitivity problems strike again. (cherry picked from commit 9aa5f949f092032589917a0bfe16e78828d0dabe) Change-Id: I5c9472c385fb045db8ab8ea54ec69bebb934ec6c Reviewed-on: http://codereview.qt.nokia.com/407 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Doc: Fixed file name of a header file to use lower case characters.David Boddie2011-07-211-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit c68d24b7bafa3058d44c0a30ade329972403b6c6) Change-Id: If733804fbab8baf5c4a5331005834ddeecec3ff4 Reviewed-on: http://codereview.qt.nokia.com/406 Reviewed-by: David Boddie
| * Get rid of the evilness of Q_GLOBAL_STATIC_WITH_INITIALIZERThiago Macieira2011-07-215-57/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That macro is a nightmare. It leads to writing code that is thread-unsafe or other problems. So rewrite the code that used this macro to use special-purpose classes with constructors. This commit does not introduce new errors. The FIXME in qicon.cpp (qtIconCache()) was a condition already present. It does fix the race conditions that were present in qbrush.cpp nullBrushInstance() and qfontengine.cpp qt_grayPalette(). Specialising QGlobalStatic is also evil. Change-Id: I039311f6a5ac9ea4ad7b310b870a2adf888da7e5 Merge-request: 10 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1895 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Forward port qt modifications for sqlite3.cCharles Yin2011-07-211-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forward port from: 1. c42bc88a9f366899747945a4478492cf765c7166 2. 0d61cf15358e1ff0b5125542ed4a9c4b7e96c141 Task-number: QTBUG-16607 Reviewed-by: Michael Goddard (cherry picked from commit 2156f7057df5c748b51a7fd16a044f39c60b872c) Change-Id: I21a4490c212e8e02ff3fc336b150d2e8bcf02c2b Reviewed-on: http://codereview.qt.nokia.com/1808 Reviewed-by: Charles Yin <charles.yin@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Forward port the vxworks changesCharles Yin2011-07-211-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | forward port from d7b688870aead912690188b324d370b920a7a600 Task-number: QTBUG-16607 Reviewed-by: Michael Goddard (cherry picked from commit c89c7ebd2600f916eab937cb4853707ab066bc25) Change-Id: I5130fcaaeb162b38c015f8649e83cbf820fb8a44 Reviewed-on: http://codereview.qt.nokia.com/1807 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Update sqlite to 3.7.7.1Charles Yin2011-07-213-20292/+39857
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated sqlite3.h, sqlite3.c and shell.c from sqlite.org SHA1 for sqlite3.c: d47594b8a02f6cf58e91fb673e96cb1b397aace0 Task-number: QTBUG-16607 Reviewed-by: Michael Goddard (cherry picked from commit 0cb9b95beb9949ec31c5c67fd360c4b463472efe) Change-Id: I56c5ce8db178ab850992812d6f8ff7e74eb9b7dc Reviewed-on: http://codereview.qt.nokia.com/1806 Reviewed-by: Charles Yin <charles.yin@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Sort all readdirs, so the output is reliableMarius Storm-Olsen2011-07-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | We need the content of the generated module master headers to be reliable, so rebuilding in the same environment doesn't produce different results. This minimizes the diff from package building systems. Change-Id: Ic914f56e13b11f313f01f6b8666c2d28aa50a985 Reviewed-on: http://codereview.qt.nokia.com/1900 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Doc: Added missing license headers for documentation and examples.David Boddie2011-07-2035-5/+1205
| | | | | | | | | | | | | | Change-Id: I696f6ce2ee9b6055c549e615de952773d171f3e7 Reviewed-on: http://codereview.qt.nokia.com/408 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
| * Add a way to check if we have a matching family in the database.Pierre Rossi2011-07-202-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed in order to get proper font fallback, and incidentally webfonts, working in QtWebKit. See: https://bugs.webkit.org/show_bug.cgi?id=55036 Internal for now, maybe it could be made public for a future release. Task-number: QTBUG-15575 Change-Id: I5c454689125cd9d5fda26ff2149208ed1beec24d Reviewed-on: http://codereview.qt.nokia.com/1829 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * Fixed build of generic linuxinput plugin.Samuel Rødal2011-07-201-0/+2
| | | | | | | | | | | | | | Change-Id: I2289e369c831bfee9646ffe5c587647443548804 Reviewed-on: http://codereview.qt.nokia.com/1870 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
| * Cleanup qRound and qRound64: provide overloads for double and floatThiago Macieira2011-07-201-8/+7
| | | | | | | | | | | | | | | | | | | | | | Instead of having #ifdefs for the type of qreal, simply provide overloads for both types. Change-Id: I58582f57d5cd68fcad3fe9efb5fea5935f61b9e3 Merge-request: 17 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/1542 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Do not use qRound with integersOlivier Goffart2011-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | Required for https://qt.gitorious.org/qt/qtbase/merge_requests/17 Change-Id: I5319ea99eb083c5931c55a246f7057fbc88c8fa4 Reviewed-by: Thiago Reviewed-on: http://codereview.qt.nokia.com/1866 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
| * Add docs for QSqlRelationalTableModel::JoinModeCharles Yin2011-07-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-8217 Reviewed-by:Michael Goddard (cherry picked from commit e2e62bc810d21fecc9ed1d1db486b529b760d292) Change-Id: Ie2af750c3a64aa634e11617cf9b3f9e7bdcf3a5f Reviewed-on: http://codereview.qt.nokia.com/1854 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Fixed behavior on NULL foreign keysDaNiMoTh2011-07-203-21/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a simple INNER JOIN, like: SELECT a,b,rel.c FROM table1, table2 WHERE (table1.smthing = table2.smthing) which doesn't show row where foreign keys are NULL, allow use of LEFT JOIN like: SELECT a,b,rel.c FROM table1 LEFT JOIN table2 ON table1.smthing = table2.smthing The trick works also for multi-relational tables. Just remember to use the new API setJoinMode. Signed-off-by: DaNiMoTh <jjdanimoth@gmail.com> Task-number:QTBUG-8217 Reviewed-by:Michael Goddard Reviewed-by:Charles Yin Merge-request: 2576 Reviewed-by: Charles Yin <charles.yin@nokia.com> (cherry picked from commit c4280dbd9bb37cca21d007f5f8b9217f80b44043) Change-Id: I349f9418e4859923977942add59872b000cac2c5 Reviewed-on: http://codereview.qt.nokia.com/1853 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * update change fileCharles Yin2011-07-201-0/+3
| | | | | | | | | | | | | | | | | | (cherry picked from commit 2b13b3d367cb6cda48ab9183d9ad5b2eee09e129) Change-Id: I3c7cecf1f099e2868653c041d88a4208b77c5748 Reviewed-on: http://codereview.qt.nokia.com/1809 Reviewed-by: Charles Yin <charles.yin@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Use truncate only for subpixel boundingBox x positionJiang Jiang2011-07-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since Lion, Core Text starts to return fractional values for x origin in the glyph bounding box. To get correct alignment we need to make it integer, it seems that round will cut certain pixels (x = 0.6 will be round to 1, then that glyph will be moved too much to the left in image glyph cache). Reverting 4297b85a appears to work fine on previous version of Mac OS X as well. This change will not affect Windows (DirectWrite) and FreeType font engines since they both return integer values for that. Change-Id: I830f5b0bd27cad3a3a84b157da428134fb979703 Reviewed-by: Eskil Reviewed-on: http://codereview.qt.nokia.com/1667 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * fix QFileInfo::isSymLink() for NTFS mount pointsJoerg Bornemann2011-07-191-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Mount points are no symlinks. Period. This was a regression to 4.7 which broke building Qt in a mount point. Change-Id: Ib36688d7d394bbb7ab52629f8273c7fe4c0d7be8 Reviewed-by: Thomas Hartmann Task-number: QTBUG-20431 Reviewed-on: http://codereview.qt.nokia.com/1830 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 16:56:08 +0000