summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Make sure the content widget never replaces valid data with empty data.Christian Kandeler2014-10-071-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | This could happen because insertContents() is called once for every run of the content provider, even if an invalidation happens in between. Example sequence: run() invalidate() [removes result of first run] run() insertContents() [queued for first run, retrieves result of second run] insertContents() [queued for second run, retrieves empty data] We now check in insertContents() whether the content provider has a valid root item and do nothing if it does not. This means that insertContents() will never replace the current model data with empty data; only invalidateContents() can do that from now on. Further improvements: - Only call insertContents() if the run was not aborted; this reduces the number of useless objects in the event queue. - Remove the m_rootItem member; it was only used in the run() function. - Only add the root item to the list at the end of a successful run; there is no reason this object should be accessible from the outside while there are still children being added to it. Change-Id: I80e2ea93dd9bbc8ab7f406c989b61f16f11b6eea Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Update Hebrew translationGenghis Khan2014-10-041-334/+334
| | | | | Change-Id: I9a4d4f236cfca386f717629b09a23e51baab6bd5 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Backport: use backslashes for UNCs pathSamuel Gaist2014-10-011-16/+23
| | | | | | | | | | | | | | | | | ShellExecute fails to open a share folder due to using '/' instead of '\'. Windows API doesn't support forward slashes for extended-length path. Extended-length path are path that start with a "\\?\" prefix. For example, "\\?\c:\very_long_path\foo\bar.txt", or in the case of a UNC path that would be "\\?\very_long_path\foo\bar.txt". [1] [1] http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx#maxpath (cherry-picked and adapted from qtbase/18c916517f3004d34482c20ed66bf09ec274d385) Task-number: QTBUG-13359 Change-Id: I2f38ecb76d87b87dc1d40bd48c94c78550a6ca1f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QLineEdit: Disable standard key 'cut' when there is no selection.Dyami Caliri2014-09-292-1/+30
| | | | | | | | (cherry-picked from qtbase/0aa84a619ea0a7c85a1ed48ed28817d4c7e40b33) Task-number: QTBUG-40477 Change-Id: I48aa7ecc4ee8a8e4e9feaf9b6cba5109d2d1f725 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix libmng test.Lisandro Damián Nicanor Pérez Meyer2014-09-251-0/+1
| | | | | | | | | | | | | | libmng pulls in libjpeg. In turn libjpeg requires that code that uses it should include stdio.h [0]. [0] <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=461602#10> So adding the corresponding include before libmng solves the issue. (cherry picked from qtimageformats/08f40bc0f00716c3a8cbda70ed00dc2f16515e85) Change-Id: Ib249fa9d867536c19be8e376f6c5595080cab006 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix DateTime with recent versions of tzdataAllan Sandfeld Jensen2014-09-2313-244/+218
| | | | | | | | | An backport of http://trac.webkit.org/changeset/150833 needed for correct time KRAT, YAKT and MOS timezones. Task-number: QTBUG-41422 Change-Id: I6e9d1db690fee8d77faa1d76c836bd7b345ce854 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix crash when accessing the content model.Christian Kandeler2014-09-194-8/+16
| | | | | | | | | | | | 1) Make sure invalidateContents() is called whenever the help engine's DB readers are destroyed. 2) In QHelpContentProvider::stopCollecting(), remove all root items, as they are invalid now: Their child items reference DB readers that are going to be destroyed. Task-number: QTBUG-18829 Change-Id: Iab3245eb9fd405f28105aa08a976d9a108b9c70a Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* OSX: make QFileDialog::getSaveFileName honor the initial file name.Erik Verbruggen2014-09-161-1/+1
| | | | | | | | | | | | | Since OSX 10.9 the NSSavePanel will call panelSelectionDidChange on the delegate when the selection is changed programmatically, even when the panel is not (yet) visible. This overwrites the selected file name with the default "Untitled" before we'd set it in runApplicationModalPanel. The fix is to check if panelSelectionDidChange is called before it is shown. Change-Id: I9ad6cd3afddc0aac35baebab31fd85cd7bf3f9e9 Task-number: QTBUG-36212 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* QPdf::addImage(): avoid a QImage detach when it's in an acceptable FormatMartin Pley2014-09-111-3/+3
| | | | | | | | | | | Don't detach QImage, when it's in Format_Mono or Format_ARG32. Use QImage::constScanLine() instead of QImage::scanLine(). Change-Id: I30fcafb576aea3189637a40fd75f77c70017ba46 Reviewed-by: John Layt <jlayt@kde.org> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> (cherry picked from qtbase/1a32cc0ae42a4a49f2d45b8ad8251ec40a30bf76) Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* admitting defeatOswald Buddenhagen2014-09-111-4/+6
| | | | | | | (cherry picked from qttranslations/b9a22c997c1a988ff8e6b52893e4673e9ac69a2b) Change-Id: I050998c14f4053a5c006d7a0da8b8befb21902b0 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QListView: Catch stack overflow on mutual scrollbar calculation.Lars Knoll2014-09-101-2/+32
| | | | | | | | | | Backport of fc4993be1fa7673016b6e5d81134463f163051f6 from Qt 5. Task-number: QTBUG-39902 Task-number: QTBUG-38517 Change-Id: I66b2c7304423dd65d67158ae0dc70ad12e4fa783 Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Fix font cache check in QFontEngineFT::recalcAdvances()Miikka Heikkinen2014-09-091-1/+3
| | | | | | | | | | | | | | Cached font was used regardless of the format, resulting in incorrect advance in some cases when default format differed from the cached format. Task-number: QTBUG-24188 Change-Id: I39e4156bd9ba743afa7e106e934c90227fbf2b8b Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> (cherry picked from qtbase/2ea976c3a713535c2419d936d575e0b24545f0fa) Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
* Revert previous QFileDialog fix for SolarisSamuli Piippo2014-09-051-1/+1
| | | | | | | | | | | | | | | | This reverts previous commit 6d47f5a168e350a6d9cbddb343ff9d75ffbd2c04, that broke compilation of QFileDialog in solaris (Sun CC). Solaris defaults to Draft version of getpwnam_r if _POSIX_C_SOURCE is not defined or < 199506L, and _POSIX_VERSION is defined as 199506L even when _POSIX_C_SOURCE is not used, so it cannot be used to detect correct posix support. Task-number: QTBUG-21451 Change-Id: Ibbf2b9de1dea74e7d8b6003d1a4e3686e5858525 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* QSwipeGestureRecognizer: Use qAbs() to check distances.Friedemann Kleint2014-09-041-1/+1
| | | | | | | Task-number: QTBUG-15768 Change-Id: Idc6c6687430365a015fb2c15f4e4dcae6a687f9f Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> (cherry picked from qtbase/74303ad497ff0e3a9876d349e2ce2f67f08c0fbf)
generated by cgit v0.12 at 2024-11-18 03:44:13 (GMT)