summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Windows QPA: Remove dependency on swprintf_s() pulled in via ↵Friedemann Kleint2014-05-191-1/+22
| | | | | | | | _com_error::ErrorMessage(). Task-number: QTBUG-35617 Change-Id: I0ad926ac564612ebd0eb38f16b3e69cbcd48e62f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix potential null pointer accessFrederik Gladhorn2014-05-191-1/+1
| | | | | Change-Id: I7516ce88b38609ab9851419566141ba93a59aed3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Direct2D QPA: Use correct buffer size constantLouai Al-Khanji2014-05-191-2/+2
| | | | | Change-Id: I2d8ec5faed959d6d642242b3e26ee0f185ee3d53 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Direct2D QPA: Stroke using direct2d primitivesLouai Al-Khanji2014-05-192-1/+84
| | | | | | | | | | | | | Use native direct2d stroking instead of falling back to QPaintEngineEx::stroke which in turn calls the pure virtual QPaintEngineEx::fill which is reimplemented in QWindowsDirect2DPaintEngine. In some cases like arc stroking this is significantly faster (up to 3x in my measurements) and results in better visual quality. Change-Id: I1c86ff772ba591432ff6550c7c59704ace4f0e0f Reviewed-by: Risto Avila <risto.avila@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Direct2D QPA: Fix version checkLouai Al-Khanji2014-05-191-2/+2
| | | | | | | | | | | It turns out that the version we were testing against was more recent than basic Windows 7 SP1 + Platform Update. The direct2d version that combination produces without any other updates is 6.2.9200.16492, and it is sufficient for us. Change-Id: Ib9840647371e2bb5c71bf74486348444ed4b4c19 Reviewed-by: Risto Avila <risto.avila@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* CoreWLan: wait for scan thread to finishDyami Caliri2014-05-182-0/+4
| | | | | | | | | | If the scan thread is running when QCoreWlanEngine is destroyed it will access stale data and cause a crash. Task-number: QTBUG-36000 Change-Id: I8cc9e39a3f7d4736da39e8b31f6963db35318f19 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* Accessibility Android: Fix statesFrederik Gladhorn2014-05-161-6/+5
| | | | | | | | | | | | Using the bit flags as parameters to the JNI functions would fail since they'd always be cast to false instead of the c-style casts. This fixes checkboxes reporting themselves as checkable and their check state. Task-number: QTBUG-38831 Change-Id: I30ab63ceabbec4cc2fbda9475e05523d915087fe Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2014-05-161-20/+42
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-141-20/+42
| |\ | | | | | | | | | Change-Id: If1abbe7810ea43ae750db91066f9f579c79b2289
| | * Scrolling devices should not override touch or tablet devicesAllan Sandfeld Jensen2014-05-131-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XISelectEvents override any earlier set event mask for the same device ids. This may cause touch devices to stop reporting touch events if they export scroll buttons or axis. The patch checks for each scrolling device if they are also a touch devices and includes the necessary bitmask if they are, and skips any devices also recognized as tablet devices as they already capture all relevant events. In addition tablet event handling will no longer block handling of wheel button events for scroll devices with the same device id. Task-number: QTBUG-38935 Change-Id: Ifd4657beb0a0cebffe89d3470ef2bd605eb3552e Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * Assume unlabelled mouse buttons are default buttonsAllan Sandfeld Jensen2014-05-131-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes legacy wheel scrolling for XInput2 drivers that fail to label mouse buttons correctly. Task-number: QTBUG-38937 Change-Id: I659890517e749dc0039489e0b7a8c38be1065d33 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | cocoa: remove rtf converter from cocoaRichard Moe Gustavsen2014-05-161-67/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is now a modified rtf converter in qmacmime that can also write rtf back to the pasteboard, and that works on both OS X and iOS. So we can therefore remove the one from the cocoa port. Change-Id: Ieed04502752290d2f139f98cec69477ff1edbe4e Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | qmacmime: rename and move QMacPasteboardMimePlainText to the cocoa pluginRichard Moe Gustavsen2014-05-161-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | com.apple.traditional-mac-plain-text is not in use on iOS according to Apples UTType reference. So we enable it only for OS X by moving it into the cocoa port. The order in which we instanciate convertors matters when the application is reading data from the pasteboard. But since QMacPasteboardMimePlainText should come before the other "text/plain" convertors on OS X, moving it to the cocoa port is safe as those convertors are instanciated after those in qmacmime. Change-Id: I76b9b14e5ce78f34e0f1ecbfee71e48a27a4687b Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | | Android: Support QFont::Courier style hintEskil Abrahamsen Blomfeldt2014-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android doesn't have a serif monospaced font, so for the courier style hint we at least need to fall back to something monospaced, which is "Droid Sans Mono" on Android. [ChangeLog][Android][Text] Fall back to Droid Sans Mono for QFont::Courier style hint. Task-number: QTBUG-37844 Change-Id: Ib42caf53a8fb7b9958e10a8f123cac928eee7069 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | | Direct2D QPA: Fix check for cosmetic penLouai Al-Khanji2014-05-141-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | When checking whether a QPen should be treated as cosmetic we need to take into account the render hints set on the painter as well. Change-Id: I8200611af08000d2d1626d8ef97eb3f6dac4951c Reviewed-by: Risto Avila <risto.avila@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | | Fix crash when loading invalid font data in QRawFontEskil Abrahamsen Blomfeldt2014-05-141-0/+3
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When passing invalid data to QRawFont, we need to fail gracefully and mark the font as invalid, instead of crashing. This crashed because of different missing sanity checks in the Windows and FontConfig font databases. [ChangeLog][Text] Fixed crash when trying to load a font from invalid data. Task-number: QTBUG-37190 Change-Id: I62c81217ec7d873350b575c9d4ae8e6f0a939540 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Accessibility Android: Fix crash for invalid interfacesFrederik Gladhorn2014-05-131-4/+6
| | | | | | | | | | | | | | | | | | | | | | When asked for an accessibility interface with invalid ID we still return an AccessibilityNodeInfo. But instead of setting that interfaces' ID to the invalid ID, rather return one with no ID set so it will simply fall back to the view. Task-number: QTBUG-38829 Change-Id: If66f5b1b42ba46949d94a547050c7a2cfc7ee9b7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2014-05-135-79/+37
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-125-79/+37
| |\| | | | | | | | | | Change-Id: I9300572e2b74f0564b2589cbd0fbdf24850f68df
| | * Use XI2 event detail to determine changed mouse buttonv5.3.0-rc1Allan Sandfeld Jensen2014-05-053-20/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The button state part of the XI2 events appears to be badly constructed on some devices and platforms. Even where supported the 'detail' field of the XI2 events is what we should be reading since it indicates the button the event refers to and not just the state of all buttons. Task-number: QTBUG-38169 Change-Id: Iedb7971194b3c27448b72c285a54100c511c17e4 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * WinRT: Fix multi-touch on PCAndrew Knight2014-05-052-59/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pointer ID was incorrectly interpreted as a device ID, which caused creating a new QTouchDevice for each touch update and potential crashes in QtQuick. The handling has now been simplified and aligned with Windows Phone, treating all touch events as if they originate from the same device. Given that the native device has no ID, it is not possible to track the native device between events anyway (even the pointer values change). Task-number: QTBUG-38745 Change-Id: I24b6c00b765dcb49cd653638afafc04fdd80f774 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | | Fix horizontal scrolling on Windows when ALT + mouse wheel is usedAndy Shaw2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-30833 Change-Id: I366d2979060ba67f745f7c783dee8d7669ebdf57 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | QNX: Silence startup warningsBernd Weimer2014-05-133-25/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing PPS objects for navigator, virtual keyboard and buttons can be expected on QNX and should not lead to warnings. Virtual keyboard info message does not contain locale object any more. Change-Id: I447d439ffbf4ea6e03f6a8bca4422a9a121d85f4 Reviewed-by: Frank Osterfeld <frank.osterfeld@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | | QNX: Don't build QNX-only parts on BlackBerryBernd Weimer2014-05-122-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only really required source files will be included when building for BlackBerry. Change-Id: Ic66b09221c48672358bba7601bc18663ad7fa07a Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | | [QNX]Clear transparent regionsAndreas Holzammer2014-05-121-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a region gets painted the buffer beneath needs to be cleared, as it could be that there are leftovers from the last blit. Change-Id: I51f19aa010015059e9a6d9d5e5e4f25fb9532d4e Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | | Direct2D QPA: Choose linear interpolation for smooth pixmap transformLouai Al-Khanji2014-05-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Let's do the same thing the raster engine does. Much faster too. Change-Id: I88ea9d2c2ac78feee1193b75a9e96c62a7bd5979 Reviewed-by: Risto Avila <risto.avila@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Direct2D QPA: Never queue more than one frameLouai Al-Khanji2014-05-121-1/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Microsoft recommends setting the maximum frame latency to 1: http://blogs.windows.com/windows/b/appbuilder/archive/2013/12/18/optimizing-directx-apps-for-low-latency-input-and-longer-battery-life.aspx http://msdn.microsoft.com/en-us/library/windows/desktop/hh780339(v=vs.85).aspx Apparently it slightly reduces power consumption and it also slightly increases performance. So let's set it. Change-Id: I8a540f1e54e83d6dc13f25564e10b751e202ce66 Reviewed-by: Risto Avila <risto.avila@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Direct2D QPA: Bump copyright year to match realityLouai Al-Khanji2014-05-0914-14/+14
| | | | | | | | | | Change-Id: I443b74e3d464285febc28345f35d1445e8102015 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | kms plugin: use first returned mode if no preferred one is presentRolf Eike Beer2014-05-081-2/+6
| | | | | | | | | | | | | | | | | | | | The list of returned modes is scanned for the first one marked as preferred, and that is used. If no preferred mode was found then the builtin default mode of 1024x768 is used. Use that builtin mode only if no modes were returned at all, pick the first one if any were returned. Change-Id: Ib355cc92219ced093c605f49dae4e34ff244b639 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | kms plugin: do not needlessly query drm information twiceRolf Eike Beer2014-05-083-16/+8
| | | | | | | | | | | | | | | | | | QKmsDevice already requested the drmModeRes and drmModeConnector information. Simply pass them to the QKmsScreen constructor instead of requesting and freeing them there again. Change-Id: I4897d76d7b13d83297c928b6e10e17ccdfdbd242 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Accessibility Android: Make debug tags consistentFrederik Gladhorn2014-05-081-1/+1
| | | | | | | | | | Change-Id: I712e64002234d546365b44ca15ae93e8decac882 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Android: text cursor position fixesPaul Olav Tvete2014-05-081-11/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android input method protocol specifies that finishComposingText() should not move the cursor. Since Qt likes to move the cursor to the end of the newly committed text, we have to explicitly move the cursor to where the preedit cursor used to be. Fortunately we already keep track of that. Also implement support for the newCursorPosition argument to commitText() since the function needed to be rewritten anyway. (It was calling finishComposingText().) Task-number: QTBUG-38794 Change-Id: Iff2c43bdbd3dda812ccdc71da63f3fa730474eef Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | iOS: Gracefully handle cancelling of subset of active touchesTor Arne Vestbø2014-05-081-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When applying the five-finger pinch gesture, we get a touchesCancelled callback with all five touch points, but the pinch gesture ends when the second to last finger is released from the screen. The last finger will not emit any more touch events, _but_, will contribute to starting another pinch gesture. That second pinch gesture will _not_ trigger a touchesCancelled event when starting, but as each finger is released, and we may get touchesMoved events for the remaining fingers. The event property 'allTouches' contains one less touch point than it should, so this behavior is likely a bug in the iOS system gesture recognizer, but have to take it into account when maintaining the Qt touch state. We do this by assuming that there are no cases where a sub-set of the active touch events are intentionally cancelled, and always clear the list of active touches. Task-number: QTBUG-37304 Change-Id: Icee79978508ecbc6854c0fb55d2da48b99d92f96 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* | Android: remove the duplicate registration for qt accessibilityLiang Qi2014-05-081-1/+0
| | | | | | | | | | | | Change-Id: I3241138e39b93657aee0564442f22ad0c40328d4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | Direct2D QPA: Check Direct2D versionLouai Al-Khanji2014-05-072-2/+135
| | | | | | | | | | | | | | | | | | | | | | Since we require a relatively recent system, check the version of the direct2d dll on disk and report an error to the user if it is too old. Previously only a cryptic runtime error resulted from a direct2d version that was too old. Change-Id: I6c3955e1a98326fca6bcdc871b0a25291391ba88 Reviewed-by: Risto Avila <risto.avila@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Direct2D QPA: Speed up text renderingLouai Al-Khanji2014-05-072-53/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After analysing text drawing performance two things seem to take up most of the time. The first is font lookup, the second is QVector initialization. To address the first point a per paint engine instance font cache is introduced. At the moment no mechanism exists to clear this cache and it is unbounded. To address the second point, we simply switch to using QVarLengthArray instead of QVector. In an artificial benchmark that draws text in a tight loop, the first change raised fps from ~70 to ~100. The second change further raised this number to ~115 fps. Change-Id: Iafa25c3e35bc42bd7c1582b0636e721c5193b494 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Accessibility Android: Do not always append roleFrederik Gladhorn2014-05-071-8/+0
| | | | | | | | | | | | Task-number: QTBUG-36584 Change-Id: Id14962a9eb7a6c3ea78cefcfcc053fac886ba8f7 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Windows: Use Format_ARGB32_Premultiplied for backing store with alpha.Friedemann Kleint2014-05-061-3/+2
| | | | | | | | | | | | | | | | | | Following the logic in Qt 4's QRasterWindowSurface::setGeometry(). Task-number: QTBUG-30302 Change-Id: Ica571cfd5098e3d9faedefaff0880acfb2209958 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Add virtual function to QFontEngine report if outlines are reliableJørgen Lind2014-05-062-0/+26
| | | | | | | | | | | | | | | | | | GetGlyphOutline fails for ttf fonts with embedded bitmaps. This results in distancefield rendering not rendering glyphs (for the failed paths). We need to fall back to texture rendering if this is the case. Change-Id: Ibdf7dc5c1d34f513c436f88fabbdcc4089bb6fef Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Accessibility: Do not report popup for QLineEditFrederik Gladhorn2014-05-061-4/+0
| | | | | | | | | | | | | | | | | | Nothing else seems to report this state and on windows for example it results in NVDA reading subMenu which makes little sense. Task-number: QTBUG-38500 Change-Id: I64820d9f2ea9174034f01da42cb2266a19c19465 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Direct2D QPA: Fix DXGI Factory discovery magicLouai Al-Khanji2014-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On some Intel configurations the current DXGI discovery breaks. Fix this by adhering to Microsoft's guidelines for discovery of the DXGI factory: http://msdn.microsoft.com/en-us/library/windows/desktop/hh780339(v=vs.85).aspx Not querying the adapter directly as in the code snippet on the site above seems to have been a typo originally. Change-Id: Ibd7546462cdab7e5ad03db9abc16fe1615b631f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | WinRT: set orientation update mask to native orientation by defaultAndrew Knight2014-05-051-0/+1
| | | | | | | | | | | | | | | | This aligns with the other mobile platforms. Task-number: QTBUG-38691 Change-Id: I7b9b70a1182c0e53f997cae111ec46b5161b0b48 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | Direct2D QPA: Draw directly to swap chainLouai Al-Khanji2014-05-056-44/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the intermediate pixmap in the backing store and draw directly to the window swap chain. This is faster and reduces memory pressure on the graphics card. In case of native child widgets we need to read back the back buffer, which incurs an extra copy in this case. In an artificial benchmark drawing animated full screen gradients as fast as possible this patch increases performance by 42% on my current machine from 480fps to around 680fps, i.e. the time for actually getting the pixels to the screen is now lower. Change-Id: Ifbeda0e199afec03cecfe76337679a9e9d082bdd Reviewed-by: Risto Avila <risto.avila@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-05-039-15/+52
|\| | | | | | | | | | | | | Manually fixed up: isES -> isOpenGLES src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
| * Cocoa QPA Menu: Clear menu items' Cocoa ancestor on destructionGabriel de Dietrich2014-05-022-0/+6
| | | | | | | | | | | | | | | | Valid for both the item and the menu destructions. Task-number: QTBUG-38685 Change-Id: I024b93c8bb8facefeaad5e8b6c7be6bf049898ea Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| * printsupport: only build cocoa backend for OS XRichard Moe Gustavsen2014-04-301-1/+1
| | | | | | | | | | | | | | | | Cocoa is not available on iOS, so the plugin should not be built. But recent build system changes exposed that we did. Change-Id: I000d54b330a075abb8f4a8b28a970bb5b5edfeb5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * QCocoaPrintDevice: Compile on Mac OS 10.6Morten Johan Sørvig2014-04-291-0/+4
| | | | | | | | | | | | | | MAXPATHLEN is not defined, use PATH_MAX. Change-Id: I5a8febce66584c15bdfe81df64fe3f1954972a47 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * iOS: Send updated expose events on application background/foregroundingTor Arne Vestbø2014-04-282-5/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an application has background processing enabled, for example for communicating with an external accessory or getting location updates, it might trigger code that does UI updates, which will kill the app as doing UI in the background is not allowed on iOS. We guard against this by propagating the backgrounding as updated expose events with a non-exposed region and isExposed() returning false. This means clients who correctly use QWindow::isExposed() to guard their drawing code (including the scene-graph), will live to see another day. Task-number: QTBUG-36956 Change-Id: Ib708394d33093affe68c9f2c7abde7e54be5ec74 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * Revert "Mac: fix bugs for font selection in QFontDialog"Liang Qi2014-04-281-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3c09f6bc9aee0c97427fe8da6efdc73b4ac473aa. After fbaa6d3ca6fc2693c5c8a1cd8e565803adc97730, OS X/iOS no longer uses localized font names. Task-number: QTBUG-38548 Conflicts: src/gui/text/qfontdatabase.cpp Change-Id: Id7f7e1976e4ffc30c5c18cf57e2acb3aebafc301 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * centralize auxiliary lib creationOswald Buddenhagen2014-04-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | this covers convenience libraries which are linked into dlls (if we are not building statically) and "proper" (installed) builds of 3rdparty code. Change-Id: I2f00248c0baa0e73346e477724bf49bbc62ba925 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-27 23:37:53 +0000