summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Backport implementation of OS X QSystemTrayIcon from Qt 5Samuel Gaist2015-02-121-62/+110
| | | | | | | | | | | | This patch aims to bring support of OS X >= 10.8 notification center and update the growl support code. [ChangeLog][OS X][Nofication] Added support for OS X 10.8 and upper notification center. Task-number: QTBUG-21830 Change-Id: Iad19c5e3a915e2caf15730a27ac762c9c11e493c Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* QThread: fix race when setting the eventDispatcherAndy Shaw2015-02-083-0/+7
| | | | | | | | | Use QMutexLocker to make this thread-safe. Task-number: QTBUG-29452 (cherry picked and adapted from qtbase/f4609b202208fe592d24c7ae3b4a48ee83045497) Change-Id: I5caf71d9a5dc6e3d655eac84426a0c5592772235 Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
* Fix QLineF Detailed DescriptionSamuel Gaist2015-02-061-1/+1
| | | | | | | | | | Currently angle() is used in place of angleTo() to describe the difference with intersect. This patch fixes that. Task-number: QTBUG-44309 Change-Id: Idfc521932247f76fe15fd980ff8e87e52feec1f1 (cherry picked from qtbase/7dd0ea7b644fe63ef57a9e7b30a9fd5312159e40) Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* QDeclarativeTextEdit: fix use of uninitialised value.David Faure2015-02-041-1/+1
| | | | | | | | | | | Detected by valgrind: ==27068== Conditional jump or move depends on uninitialised value(s) ==27068== at 0x70C7289: QDeclarativeTextEdit::updateTotalLines() (qdeclarativetextedit.cpp:1742) Backport from qtquick1 Change-Id: Iafc0c0072e6ab318fd4643e8ac7531edf5ec7ad0 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix a translation for zh_CNLiang Qi2015-02-031-1/+1
| | | | | | Task-number: QTBUG-32452 Change-Id: I78e70732f03be9b94ceb9efaab72f3693d6dd523 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* *.sln not generated correctly for VS2012 and VS2010Katja Marttila2015-02-021-4/+4
| | | | | | | | | | msbuild fails to build project since sln not generated correctly Task-number: QTBUG-33446 Change-Id: If92ea743b1b407446873210090aa8591a491abad (cherry picked from qtbase/3515365b9843b12e488880a0685b71f7b3250c33) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Added check if fontEngine is still in the cache.David Weisgerber2015-01-291-1/+1
| | | | | | Task-number: QTBUG-22942 Change-Id: I9e4ac72168886769993cb19fac7a370c377ff3af Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Fix wrong Japanese translationTakumi Asaki2015-01-291-3/+2
| | | | | | | | | | Translation in Qt5 is already fixed in qttranslations/16d5447febe09fcb44be6cdb77e03ffb80238bd9. Task-number: QTBUG-44081 Change-Id: I114a402573f47df604d529407774d44ac3c419f1 Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix bugs generating PDF on CocoaJames Turner2015-01-292-3/+67
| | | | | | | | | | Provide real implementations of: properties(), faceId() and getUnscaledGlyph Task-number: QTBUG-10094 Change-Id: Ib84a7a5c9e29e4d634b47bc2856787b2482048da (cherry picked from qtbase/517fb9026896f7ac20376f253babae5a7c57721d) Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Use qt.io rather than qt-project.org for network testsShawn Rutledge2015-01-283-3/+3
| | | | | | | | Mainly because of a change in certificates which is causing failing tests. Cherry-picked from https://codereview.qt-project.org/104619/ Change-Id: I8304e5ac4107428a250b71be5df7b5399a811017 Reviewed-by: Richard J. Moore <rich@kde.org>
* Bump year to 2015Kai Koehne2015-01-1528-51/+51
| | | | | | | Bump year to 2015 in all but source code comments. Change-Id: I1dd7972dee65a86a9bd560ead32bbd0cbe82f439 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Ignore expired certificate during certificate validationAndy Shaw2015-01-141-19/+12
| | | | | | | | | | | | | | | | | | | | | | | OpenSSL has a bug when validating a chain with two certificates. If a certificate exists twice (which is a valid use case for renewed CAs), and the first one it hits is expired (which depends on the order on data structure internal to OpenSSL), it will fail to validate the chain. This is only a bandaid fix, which trades improved chain validation for error reporting accuracy. However given that reissuing of CA certs is a real problem that is only getting worse, this fix is needed. See also: https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html#WARNINGS [ChangeLog][QtNetwork][QSslSocket] Added a workaround to an OpenSSL problem that may cause errors when the trust store contains two certificates of the issuing CA, one of which is expired. Task-number: QTBUG-38896 (cherry picked and adapted from qtbase/0065b55da42b8c6ee0095264b5275fb708887c9d) Change-Id: I2515d79a442bec96734ea88ea850e6e8c2123a6c Reviewed-by: Richard J. Moore <rich@kde.org>
* Doc: Update copyright information in documentation templatesTopi Reinio2015-01-1414-32/+32
| | | | | | | | - Update copyright year to 2015 - Update copyright holder to The Qt Company Ltd Change-Id: I2ed489f82639c93344051de38491183987a743e1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Update GitIgnoreOrgad Shaneh2015-01-121-0/+5
| | | | | | | Add webkit artifacts Change-Id: Ifeb9f0fdf4651183400719f46257dd430b57b362 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Update Hebrew translationOrgad Shaneh2015-01-121-305/+305
| | | | | | | | All covered except XmlPatterns Change-Id: I71097ac3263ec720efadfc9973132c52d4703d2d Reviewed-by: Genghis Khan <genghiskhan@gmx.ca> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Introduce Windows version 10.Friedemann Kleint2015-01-102-0/+6
| | | | | | | | | | Detect OS kernel version 10.0 as Windows 10. Task-number: QTBUG-43413 Change-Id: I39307cf8cc2e7cc209d6a88b8576db87086fa20e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/b495a27d4e28ed19b00557dbaf8ab5d31c21ae4f) Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix empty arrays in QML 1Robert Griebl2015-01-082-0/+8
| | | | | | | | | Commit bb0239e added a regression, where empty arrays would produce errors in QML 1. Task-number: QTBUG-43656 Change-Id: I6d416b2387a1dfd3588c000368fc1223d08399bd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Windows: Fix OS version determination for Windows >= 8Friedemann Kleint2015-01-081-10/+67
| | | | | | | | | | | | | | | First, try to determine the version of kernel32.dll by using the version API. If that fails, loop using the version macros, taking the major version into account. Hangs in the minor version loop have been observed, potentially related to the major version. Task-number: QTBUG-43413 Change-Id: I982e78873510e7598c7cf839177e59812acd86f6 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> (cherry picked from qtbase/6796f2337ee31b4b4f07eaa54d868b999c39233a) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDateTime: Fix time format in docOrgad Shaneh2015-01-071-1/+1
| | | | | | | | | MM stands for month, SS is invalid Task-number: QTBUG-12236 Change-Id: I9b4a57d05d77fd38db30b53b16c382ea545edb80 (cherry picked from qtbase/a457bf3ff73627aa2c95f0482a838b14fd3233a0) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation with QDND_DEBUG.Friedemann Kleint2015-01-062-5/+7
| | | | | | Task-number: QTBUG-43466 Change-Id: I9a8ef1f33635469f12d259af9716eb60b650a9de Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Add Hebrew translation for Qt LinguistOrgad Shaneh2015-01-041-0/+2259
| | | | | | | Started-by: Genghis Khan <genghiskhan@gmx.ca> Change-Id: I761e104437ea99cbb1a44f3571824546a9b19a18 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Genghis Khan <genghiskhan@gmx.ca>
* Check world matrix is true when seeing if transformations are supportedAndy Shaw2015-01-021-0/+2
| | | | | | | | | | If the world matrix is turned off then if the raster paintengine should not support transformations for the text as otherwise it could end up being incorrectly transformed. Task-number: QTBUG-35200 Change-Id: I68fa6654ee87016986ba9d9469673fc8b9e0875e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* QIdentityProxyModel: remove slow bounds-checking, for more performanceDavid Faure2014-12-241-3/+0
| | | | | | | | | | | | | If we're called out of bounds, sourceModel()->index() will take care of returning an invalid model index anyway. So calling rowCount+columnCount every time index() is called can be avoided. These calls can be particularly slow when sitting on top of a stack of proxymodels. And index() itself is called very often, i.e. when a proxymodel on top of us is used by a delegate which calls data() for many different roles. Change-Id: I00dd5cf432c0591f41e6fa6fc86c845f29845cd1 (cherry picked from qtbase/3de0f442b5857915f26be6600bc8e54d1af08208) Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Autotest: Setting tst_qaudiooutput and tst_qsound as insignificantSimo Fält2014-12-242-1/+2
| | | | | | | | | These always fails on virtual Mac CI nodes. Task-number: QTBUG-43507 Change-Id: I8f8fab92693aea7c797eee4e930c8ed5e82954c9 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Use metrics returned by GetGlyphOutline in GGO_METRICS modelasconic2014-12-161-3/+26
| | | | | | | | | | | | | | | GetGlyphOutline Windows API returns wrong values when used with an OpenType PS font and in GGO_NATIVE mode. It causes problem when exporting to PDF. The fix changes the GetGlyphOutline call to use GGO_METRICS instead. Task-number: QTBUG-12799 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Change-Id: I38ca46d50e490e3b704a89d08b1a8697bca5f079 (cherry picked from qtbase/4aba2d07d2fe67beaf544a4b38c5b9aa8b8ec39b) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fix OpenType fonts with cmap tables on WindowsJosh Faust2014-12-132-3/+11
| | | | | | | | Task-number: QTBUG-31656 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Change-Id: If941bddb6173b6bd93117ba5bd35fa4050f29e3d (cherry picked from qtbase/0a170be576153b84ee6249f1a2b7cbce1ef10d84)
* Make distance fields rendering work with Opentype CFF fontsEskil Abrahamsen Blomfeldt2014-12-132-1/+14
| | | | | | | | | | | | | | If the font has a CFF table, GDI will not label it as TMPF_TRUETYPE, however, we can still use GetFontData to get the SFNT tables. This is required to get the maxp table which contains the glyph count, which is required to use the font with the distance-field renderer. Task-number: QTBUG-28746 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Change-Id: I1e084f7e9dbd0bccb9b1ff4de2eaf65d6a5f9f1e (cherry picked from qtbase/dde09c429ae8b7ad0df4e4b36b8459d2b85a1219) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* fix glyph's CMAP index might be corruptedKonstantin Ritt2014-12-131-1/+1
| | | | | | | | | | | when SMP sybmol is present in the font. this is a simple typo fix, actually Change-Id: I34fc01171f2893d36d36cc929b4f1a789a5f36db Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> (cherry picked from qtbase/51998eb4f65b92640176973ba0e0ed14adee561d) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* fix QWebSettings::setUserStyleSheetUrl() not working with windows pathsAshish Kulkarni2014-12-131-1/+1
| | | | | | | | | | | | | | | QWebSettings::setUserStyleSheetUrl() does not work with windows paths that contain drive letters. KURL::path() alone does not handle removing the leading slash from a windows file path. Using QUrl::toLocalFile() will turn ​file:///C:/path into C:/path appropriately This fixes https://bugs.webkit.org/show_bug.cgi?id=34884. Change-Id: I37a1482b67447be6ea6a10966cf59c9159db83cd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fixed a bug where spans did not always work in layouts.Jan Arve Saether2014-12-102-1/+18
| | | | | | | | | | | | | | | | | The problem was that the span we stored in the multiCellMap was the "effective" span (i.e. the given span subtracted with the number of ignored rows it would span). Later we used that span to distribute its size across all its cells. However, since the span now could be smaller that the given span, we could sometimes fail to distribute to the last span(s). [ChangeLog][QtWidgets][layouts] Fixed a bug where spans sometimes didn't distribute themselves to the last cells they covered. Change-Id: I7bfbbe721f0ec4398be6a5f234c109ddfec18514 Task-number: QTBUG-43099 Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com> (cherry picked from qtbase/c9db6e52bc9bd9731159fcb4e95fca5cba01bc9c)
* Windows: Fix return value of QDesktopServices::storageLocation(DataLocation).Friedemann Kleint2014-12-041-6/+7
| | | | | | | | | Return empty string if SHGetSpecialFolderPath() fails for DataLocation, ie, the directory does not exist. Change-Id: I2abf41174b904fe36e587894832c0f3f4947dc1e Task-number: QTBUG-43092 Reviewed-by: David Faure <david.faure@kdab.com>
* Rewrite debug output of event classes.Friedemann Kleint2014-12-031-242/+359
| | | | | | | | | | | | | | | | | | | Bring debug formatting in Qt 4 on par with Qt 5.4: - Introduce functions to return class name and type name by type. - Add verbose output for DnD, tablet, native gestures and context menu, events. Task-number: QTBUG-38858 Task-number: QTBUG-42344 [ChangeLog][QtGui][QEvent] The debug output for events has been significantly improved. Change-Id: I3f11e34c3c9d6a3c6db596be4051b801f00e6153 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> (cherry picked from qtbase/14f9c09542bd6cc19430473da9ce4c68f239ec7d) Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Bump Qt version to 4.8.7Akseli Salovaara2014-12-0320-40/+146
| | | | | Change-Id: Icd6fcdb59eb1b9fd8de555ef1c1c87a379f06a27 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Auto-scroll while selecting entire rows/columns did not workJan Arve Saether2014-12-031-2/+4
| | | | | | | | | | | | | | | | If you press and hold a section in a header view you can extend the selection to more rows by moving the mouse. This worked fine until you moved the mouse outside the geometry of the header view. The expected behavior was then to scroll the view (this is what happens with extended selections on regular table cells). [ChangeLog][QtWidgets][QHeaderView] Auto-scroll the view when making extended row/column selections. Change-Id: Ic65aa34d370e74054b2123ab57edb1add0e8adb9 Task-number: QTBUG-21201 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com> (cherry picked from qtbase/f9408317e70bc2e635a2f9baeff35d1c06227734)
* Fix minor compiler warningKevin Funk2014-11-271-1/+1
| | | | | Change-Id: Ifb0e8c7998ca2b4cba9ce4a34655614d7cefb860 Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
* Only add the res_file to the generated files if there is no rc_fileAndy Shaw2014-11-271-1/+2
| | | | | | | | | | | If both the rc_file and res_file was added to the project then in MSVC 2012 it would cause an error complaining of a duplicated resource. Task-number: QTBUG-29826 Change-Id: Ib3401b423208cd8c90895038c9cbadd80c39b542 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/fa1fb5ed945650d45cf9b61906232cfbae11360e) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove the use of a template qUnused function for ICCThiago Macieira2014-11-261-1/+1
| | | | | | | | | | ICC 12 does not seem to need this. Change-Id: I98e9d530e767c4d24424f0c2b5d763f863e85fe4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (backported from qt5/qtbase d3951a5b0f4fe9731d1512668b43f51bd98bd84e) Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Fix string placeholders in two translationsAndy Shaw2014-11-251-2/+2
| | | | | | | | As the translation in Qt 5 is more out of date this is being fixed directly in the Qt 4.8 version as this is more accurate. Change-Id: Ie7abbd224e26f8af63d80acd81ddf2973b39e0d4 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* Fix thai symbol rendering slownessKonstantin Ritt2014-11-221-1/+3
| | | | | | | | | | | Harfbuzz is constantly trying to load libthai in src/3rdparty/harfbuzz/src/harfbuzz-thai.c, making rendering of thai symbols very slow. Task-number: QTBUG-37665 Change-Id: I30a2a5489271534eeacc205d8106b22130c40c5f (cherry picked from qtbase/47e6ec0736aa129e181e0b6f02cec884f9832432) Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Parse multiple buttons during mouse press and releaseAllan Sandfeld Jensen2014-11-041-3/+5
| | | | | | | | | Copies the logic for parsing mouse buttons from Qt5 QtWebKit so that button clicks when another button is held works. Task-number: QTBUG-42319 Change-Id: If56e20533531fe949eef444eb7e2f747907f5bcc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Adjust the layout if a QGraphicsWidget is explicitly hiddenJan Arve Saether2014-10-316-1/+131
| | | | | | | Task-number: QTBUG-20132 Change-Id: Iab59fc9b61d4ca1bb2208c479a027da6eb0283a9 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com> (cherry picked from qtbase/bf200fc948d89e1a735a8bcca879654028f944d2)
* Fix compiler warningLars Knoll2014-10-301-1/+1
| | | | | | | | Already fixed in Qt 5 Task-number: QTBUG-42032 Change-Id: I7ed7d955115e875468b94759bda44f99b737e7cb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Handle relative paths correctly for files in QMAKE_BUNDLE_DATAAndy Shaw2014-10-271-0/+1
| | | | | | | | | | | | Partially cherry pick from f6bd02317db7beadda1237df7feddd4a780415cb from Qt 5. The Qt 5 SHA1 changes a lot of different parts in the XCode generator after a general qmake change caused some problems. So we just pick the part needed to fix the handling of relative paths used in files in QMAKE_BUNDLE_DATA. Change-Id: I364f82a353dfa922591d07c2aa9061666b79de02 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* qmake vcxproj generator: write PrimaryOutputExtension valueJoerg Bornemann2014-10-274-8/+33
| | | | | | | | | | | | | | | Second attempt. MSVCPROJ_TARGET contains the resolved target name, including version number and target extension. We're splitting this value into PrimaryOutput and PrimaryOutputExtension. PrimaryOutputExtension is only written if it contains a non-default value. Task-number: QTBUG-26782 Change-Id: I4b828dc5dd47322f653585aee1a5767f0cf8bd48 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from commit qtbase/d1e950b919615c1ae754e07899f1b45303c17654) Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* fix warning when generating VS 2013 projectJoerg Bornemann2014-10-271-0/+5
| | | | | | | | | | | | /FS forces the compiler to synchronize pdb file writes. This option is not needed when building with Visual Studio itself. Still, qmake needs to know it when parsing the compiler flags. Task-number: QTBUG-36535 Change-Id: Id5b68c4028844e0b95904e08b5121310a4ff13d6 Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from commit qtbase/9b59e51c5064c67c423389c2c884d009903910c7) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Windows native socket: handle WSAENETRESET the same as WSAECONNRESETShawn Rutledge2014-10-221-1/+1
| | | | | | | | Backported from Qt 5. Task-number: QTBUG-41934 Change-Id: I4cebfb4b5f6e400b54cab3271af4411becd91b9f Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix license text and URLs in QMessageBox::aboutQt().Friedemann Kleint2014-10-201-14/+14
| | | | | | | | | | | Point to new qt.io site, adapt licensing text. Task-number: QTBUG-41798 Change-Id: I492df6a842c2b31e44653fb4388408c209f24f1e Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> (cherry picked from qtbase/4a2cf9ca4174ee9879bfc5858f10dacc028a521f) Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QTreeView: speed up isRowHidden for the case where no rows are hidden.David Faure2014-10-131-0/+2
| | | | | | | | | | isPersistent(index) is a linear search, which we can avoid altogether (as well as the creation of a persistent model index, is idx is indeed persistent) when the row-hiding feature isn't used at all. Change-Id: I55ef204dd9b79a89d51d5d3aacc1c110d37a4ea0 (cherry picked from qtbase/cd824ee79188b889df85d4d648a625589655e15e) Reviewed-by: Jan Arve Sæther <jan-arve.saether@theqtcompany.com>
* [OS X]: respect icon visibility preference in system tray menusRené J.V. Bertin2014-10-091-1/+1
| | | | | | | | | | Check the `IconVisibleInMenu` switch so that systray menu items only show an icon if the application/user has configured things that way, and not otherwise. Task-number: QTBUG-41348 Change-Id: Ibb7db326fd598ca78cb95c815b5e165de2babeda Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* QMacStyle: Fix QTabBar appearance on YosemiteJari Tenhunen2014-10-071-10/+19
| | | | | | | | | | | | The selected tab text color should be white except when the window is not active. Also, no text shadow should be rendered in any case. Finally, there's no need to move the tab shape up anymore. Backport of qtbase/e9e66079b16754f1fef89c2ad93593d7d55c8654 Change-Id: Ib41b9ccb990dc5c550f5a48c855bebd39262b06e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>