summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Fix duplicated application menu items on Mac OSChris Meyer2013-03-203-4/+10
| | | | | | | | | | | | | | | | | | Added code to check to see if the menu item already exists in the application menu before adding it. Change-Id: Ie0a5eab3c61d5a3413a834d2e57bab40660f6802 Task-number: QTBUG-27202 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Clarify mention of QAbstractItemView in the canFetchMore docs.Stephen Kelly2013-03-191-3/+2
| | | | | | | | | | | | Change-Id: Ic93054d8fc68497fb0bcc2c5491924b9c57b78ad Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Fixed QTextureGlyphCache glyph padding.Yoann Lopes2013-03-191-5/+11
| | | | | | | | | | | | | | | | Padding was correctly added between glyphs but it was missing at the texture edges. Change-Id: I6d5e1206194f6aecefcfc45ead22d54c1207de4f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Use quotes for the error message and remove a line break for cohesionLaszlo Papp2013-03-191-2/+1
| | | | | | | | | | Change-Id: Id0964ee2a084d721051338f4c2587acb7d1b1cde Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | qdoc: Sort QML methods by nameMartin Smith2013-03-191-3/+2
| | | | | | | | | | | | | | | | | | | | | | qdoc was using the method signature (beginning with the return type) to sort methods for listing in the HTML output. Now qdoc sorts on the method name, which makes the list easier to read. Task-number: QTBUG-29708 Change-Id: If3785ccd5849df53b01043c2dada0b6bf3c00614 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Run CMake dbus tests if dbus is expected to be available.Stephen Kelly2013-03-193-4/+6
| | | | | | | | | | | | | | | | Instead of first finding it and then testing that we can find it. Change-Id: I1a1090693520b1d6adadef93839f25d277947e76 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Fix missing glyphs for large fontsEskil Abrahamsen Blomfeldt2013-03-191-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For large fonts, we would get invalid metrics due to the metrics being too large to fit in the signed chars of the cache struct. This in turn would lead to the bounding box reported by the font engine being wrong, and subsequently, the algorithm which decides whether any part of the glyph is visible in the raster engine would make the wrong decision, hiding glyphs that should not be hidden. Task-number: QTBUG-30026 Change-Id: I59b613ce889fcac0bd50ffec9d369728068d0263 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Tests: stabilize tst_qwidget::scroll on small screensJ-P Nurmi2013-03-181-4/+10
| | | | | | | | | | | | | | | | | | | | | | The test has been recently failing in CI. The problem was easy to reproduce in a virtual machine by resizing the window of the virtual machine small enough. This change makes sure that the requested size hint is significantly smaller than the desktop size, to avoid the window manager stepping in and limiting the window size. Change-Id: Ie319892747bee60ea6f11e27b6c1bfb4731ef587 Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Tests: stabilize tst_QDockWidget on small screensJ-P Nurmi2013-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | The test has been recently failing in CI. The problem was easy to reproduce in a virtual machine by resizing the window of the virtual machine small enough. This change makes sure that the requested size hint is significantly smaller than the desktop size, to avoid the window manager stepping in and limiting the window size. Change-Id: Id8ce63b2b88cbed964e0330633c5d2e1dc33598c Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* | Make the qtbase cmake tests work without the Widgets module.Stephen Kelly2013-03-184-15/+30
| | | | | | | | | | | | | | | | Task-number: QTBUG-28540 Change-Id: I916d104c8aba551ee9a5b34da3fd85dcb26bbf64 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Add dynlist file for QtGuiStefan Gehn2013-03-182-0/+6
| | | | | | | | | | | | | | | | | | | | Similar to QtWidgets ensure that QGuiApplication::notify() is always called via its exported symbols. This is needed to allow overloading it via LD_PRELOAD or other means. Change-Id: I84d0176b984c5fdf9b199127e08fcfa93dbc853f Reviewed-by: Harri Porten <porten@froglogic.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Update dynlist file for QtWidgetsStefan Gehn2013-03-183-9/+6
| | | | | | | | | | | | | | | | | | - Rename dynlist file to reflect the Qt module its used for - Drop removed functions/methods from dynlist file Change-Id: I5e2b369f0f62c1daff8086e9dbc3f62150bd26ea Reviewed-by: Harri Porten <porten@froglogic.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Q(Styled)ItemDelegate: disable style animationsJ-P Nurmi2013-03-182-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The style animation system expects a single QObject per animated item. Therefore, this change disables style animations for checkboxes etc. within itemviews, because the view cannot act as an animation target for several checkboxes. The result of that kind of animation would be randomly checked/unchecked checkboxes, or sometimes even left in the middle of the transition. Task-number: QTBUG-30146 Change-Id: I1d7165571c723e84a0e6fbda266cb03b04deabd8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Set the INTERFACE_QT_MAJOR_VERSION to 5.Stephen Kelly2013-03-181-0/+5
| | | | | | | | | | | | | | | | | | This way, CMake will issue an error if there is an attempt to use Qt 4 and Qt 5 in the same target. Change-Id: I0cad31b00f7eb7dc372491e0f5734765551c3d6e Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | qdoc: Now checks for existance of each exclude dirMartin Smith2013-03-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | If the dir exists, it is added to the list of exclude dirs. If it does not exist, it is ignored. If it does not exist, qdoc assumes there is nothing to exclude there and does not report an error. Task-number: QTBUG-29736 Change-Id: I657b84f1a967d03f83a803402d8670f9113933eb Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Fix the is_enum type trait for char16/32_t (C++11)Laszlo Papp2013-03-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add the char16/32_t types to the is_integral check with true for the type traits to pass the qglobal test for the is_enum functionality. Otherwise, those types will be detected as enums due to the internal test. These types are integral after all. Change-Id: I89ef6b6b4be348d8ef57b0d19ccea55b435e9b14 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Amend the missing documentation for the from*() static overloadsLaszlo Papp2013-03-171-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | c951908bc201afa59402967d50fa926212845fae sneaked in without adding documentation to those public static methods. Hence, the public documentation online for those methods appear to be empty. More importantly, they have been missing the indication that the introduction took place in Qt 5.0. Change-Id: I3ca3fa57a96e28e2d64d0af28159d8bda9cbe71a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Fix tst_moc when variadic macros are enabledOlivier Goffart2013-03-172-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | moc do not see Q_COMPILER_VARIADIC_MACROS as defined (because it does not know the builtins defines) So it would never parse those macro, and never generate the signals or slot. Always let moc parse the variadic macro, and put non-macro function in the header so the generated code would compile on every compiler Change-Id: Ie9504539ee737c81e831b217f8d623fe810d9e35 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Remove the usage of undefined QFontDatabase::WritingSystemLiang Qi2013-03-151-8/+0
| | | | | | | | | | | | | | | | There is no definition for Yi, Tagalog...Braille in QFontDatabase::WritingSystem, see the header file. Change-Id: I0187b0ea23cdb49c4c3306217296d727d4983652 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | append $$QMAKE_DEFAULT_INCDIRS to moc invocationsOswald Buddenhagen2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | unlike the real compiler, moc does not have these directories built in, so it would not find headers from a system install of qt. Task-number: QTBUG-28870 Change-Id: I86f18cdc8953145190163746dae59f4e784f2d78 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | de-duplicate code a bitOswald Buddenhagen2013-03-151-4/+6
| | | | | | | | | | Change-Id: I35cd81e308c512bdec50de1f19ae9c708012afa0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | remove overuse of $$list()Oswald Buddenhagen2013-03-151-2/+2
| | | | | | | | | | Change-Id: I383b0af8c37acd9dc34a8cf5718f4d850099b64b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Make cmake tests not depend on QtWidgets where not needed.Stephen Kelly2013-03-152-3/+3
| | | | | | | | | | | | Change-Id: Ib6347360d678bbe54445ebb0680ad66d77a7f3c7 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Clean up cmake test regarding dependencies.Stephen Kelly2013-03-151-4/+2
| | | | | | | | | | | | | | There is no need to list the dependencies of the Widgets module. Change-Id: I9469d4f352685f7122a258f1a44bd017fdc5b3a7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Join the CMAKE_PREFIX_PATH components into a cmake list before use.Stephen Kelly2013-03-151-1/+2
| | | | | | | | | | | | Change-Id: I16e05b72e57473239b89498313ba7745ffa6a346 Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Don't fail on tst_QSslSocket::setReadBufferSize_task_250027Stephen Kelly2013-03-151-1/+8
| | | | | | | | | | | | | | | | | | It is flakey and often blocks integration. Task-number: QTBUG-29730 Change-Id: I8acfc243ec6a6782b7f7d78fc27827f3fdc1ce52 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Make sure QGLWidget::setContext() is correctly documented as obsolete.Samuel Rødal2013-03-151-1/+7
| | | | | | | | | | | | | | Task-number: QTBUG-30017 Change-Id: Idf3c943d7aaad294cbf6858cca1c01e841e94b7d Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Fixed QPainter::drawPolyline() not drawing solid lines.Samuel Rødal2013-03-151-1/+16
| | | | | | | | | | | | | | | | | | If a line segment isn't filled we keep using the same point of origin. Task-number: QTBUG-26156 Change-Id: I20af8410a7039b69848f201ab62fd3c01b95531b Reviewed-by: Titta Heikkala <titta.heikkala@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Make QCoreApplication::startingUp() return false when appropriate.Mitch Curtis2013-03-143-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, QCoreApplication::startingUp() returns true even after a QCoreApplication has been constructed. This patch makes it return false after it has been constructed and adds checks to QApplication and QGuiApplication to ensure that it returns true within the constructor of these classes. Task-number: QTBUG-2591 Change-Id: Ie511522d35b5658c20be43dd112eae18c205277f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | Doc: corrected snippet statement in qplugin.qdocNico Vertriest2013-03-141-1/+1
| | | | | | | | | | | | | | | | Corrected path for snippet with Q_DECLARE_INTERFACE Task-number: QTBUG-29101 Change-Id: I910bb339a4ec6ecf2ad1ea76eaaa73114ab65a68 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Fixes: assert in QPainter::fillRect on very large paint devicesaavit2013-03-141-0/+2
| | | | | | | | | | | | | | | | | | For devices taller than 32768, fillRect with linear gradient would go below the cliprect. Task-number: QTBUG-26766 Change-Id: I516ede1545909e9ce2de5812c61bb473f99f5759 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | QProcess/Win: stop pipe readers before closing the pipe handlesJoerg Bornemann2013-03-141-0/+2
| | | | | | | | | | | | | | | | The pipe readers should not operate on closed handles. Change-Id: I6514b949e5ab2adf89633463fc599e8d02c43693 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | fix spurious QWindowsPipeWriter deadlockJoerg Bornemann2013-03-141-5/+7
| | | | | | | | | | | | | | | | | | | | | | We must check the return value of CancelIo(Ex) and only wait for a notification if it was successful. CancelIoEx can fail, if the handle is closed before the QWindowsPipeWriter destructor is called. Change-Id: I2dcc97052be917c69d18c277856374cbc07e2169 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Set StyleMask to NSBorderless if FramelessWindowHint is set.Irfan Omair2013-03-141-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-29815 Change-Id: Idb93843a2ad8332c81587c245fe73aa2bf5cc661 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Stephen Kelly2013-03-1322-53/+182
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-03-0822-53/+182
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/opengl/qgl/tst_qgl.cpp Change-Id: I3c601351c984c1f4b00478d3c47ac9eeb021e892
| | * Fixed dashes being rendered differently depending on system clip.Samuel Rødal2013-03-075-18/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to clip lines to the unclipped device rect in the case of dashing, since otherwise the dashes will be shifted and rendered differently when partial repaints are done. Task-number: QTBUG-24762 Change-Id: I3599b54baa552acc20bf8cc2e12f846b45f6019e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * Attempt to stabilize tst_qgl::graphicsViewClipping().Samuel Rødal2013-03-071-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the graphics view is exposed and has been painted before trying to grab the framebuffer. Task-number: QTBUG-29943 Change-Id: I2945cb78b58265864744a0d5fc99fb430306b578 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * Correct QLocale(const QString &) documentation.Mitch Curtis2013-03-071-2/+2
| | | | | | | | | | | | | | | Change-Id: I6430ff2636083204fa12437980626260f848e269 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * remove some cryptic code relating to output directoriesOswald Buddenhagen2013-03-073-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | the purpose of it is truly elusive - the output directory is maintained by the surrounding code anyway. Change-Id: Id1a481d85a7b83ab0676ef650c900414d0ba83b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * Cocoa: Pick right rectangle when rendering window maskGabriel de Dietrich2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ususally, the object setting the mask knows better than the window, since the latter may not have had its size set by then. Task-number: QTBUG-29856 Change-Id: Ib24d452a98a76b57f5d9236d5fa1ba4755cf0840 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Cocoa: Fix shadowless popupsGabriel de Dietrich2013-03-062-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | The window shadow was never invalidated after setting the transparency mask. We now do it right after the first draw after setting the mask. Change-Id: Icc5c6002d25abeb25d58ee4d1f868e928121ae9b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Correct sentence in QNetworkProxy::setApplicationProxy() documentation.Mitch Curtis2013-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: I46fa7f814901cbe6a1f8f003f461bf1eee6f8bde Reviewed-by: Shane Kearns <shane.kearns@accenture.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Jonas Gastal <jgastal@gmail.com>
| | * require modules to define their versionOswald Buddenhagen2013-03-063-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | otherwise they would inherit it from qtbase, which may effectively result in a lie if building against a different release. for convenience we define the version centrally per repo. qtbase is special, in that we use the version defined in qglobal.h to avoid defining it redundantly (the instance in qglobal.h is currently needed to bootstrap qmake; the configures would need some work to change this). Task-number: QTBUG-29838 Change-Id: Ie9a5b0ff0d64b69ff2d34af2f7c42d6278e957cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Fixed potential access violation in QPixmap::copy() for <32 bit pixmaps.Samuel Rødal2013-03-062-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QImage is supposed to maintain the invariant that each scan-line begins on a 4-byte boundary, so we need to verify that this is the case before using the optimized path of short-cutting QImage::copy() by referencing the source image's bits directly. Task-number: QTBUG-14766 Change-Id: I0a178aeb2f34cc64f98deae9470b55b5c53fcb06 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| | * Cocoa: Improve expose event handling.Morten Johan Sørvig2013-03-066-9/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send expose events on window and view show/hide notifications. Implement QCocoaWindow::isExposed. Close all windows on quit. This allows sending (de-)expose events for those windows while the event loop is running. Remove the flushWindowSystemEvents call in setVisible. This function is called from application code. Flushing window system events here is wrong since it can lead to events being processed in the middle of the user code call stack. flushWindowSystemEvents should only be called as a result of (native) window system activity. Skip one of the tst_qtooltip tests which becomes unstable/ fails in the CI system as a result of this change. Task-number: QTBUG-29583 Change-Id: I3fb8b3f77e2b2e19dfeafba5d7dfcef602891d37 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | | If a QWindow without a platform window is resized, emit changed signalShawn Rutledge2013-03-131-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Needed as a consequence of I4f5e37480eef5d105e45ffd60362a57f13ec55f5 Otherwise a Window in QML doesn't get notified to update its layout after being mapped the first time, on Linux. Change-Id: I8b1291e16b11eb93ab045ac5c5ed6b478391cb21 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | Fix sluggish resizing for opengl windows on X11Shawn Rutledge2013-03-132-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | Disable sync protocol for OpenGL surfaces in the XCB plugin. Task-number: QTBUG-29304 Change-Id: I4cb47b04637e15e012758d3b0840abd13d27df69 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | | Reorder for performance reasons.Sérgio Martins2013-03-132-2/+2
| | | | | | | | | | | | | | | | | | | | | isSymLink() can be expensive in a few cases. Change-Id: I6f84414cf7057453d62225ab4f45dcdf92ed017b Reviewed-by: David Faure (KDE) <faure@kde.org>
* | | postgresql driver: escape backslashes only when server requires itMark Brand2013-03-131-5/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30076 Change-Id: I408cda941884f01484d0edfa82c91fc19cb8718c Reviewed-by: Israel Lins Albuquerque <israelins85@yahoo.com.br> Reviewed-by: Sergey Blagodarin Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Andras Mantia <andras@kdab.com>