summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove QPlatformScreenPageFlipper.Robin Burchell2014-08-196-227/+0
| | | | | | | | | | | | | | | | Use of this was removed from QtWayland quite a long time ago, which was the only public user of this API. Furthermore, it isn't easily possible to implement any use of this API without full control of the graphics stack (a very rare occurrence) and there is no public demonstration of this. There is ongoing research to provide a better replacement for this in the form of QPlatformHardwareCompositor. Change-Id: I80d666a5b465aa80f73fed6c44838ce7210bbd30 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* winrt: Remove depth/stencil from the default window formatAndrew Knight2014-08-191-2/+0
| | | | | | | | | | | After the last ANGLE upgrade, some hardware fails to render proper QtQuick scenes when using a depth buffer (which is present in the default window format). As the batched renderer no longer requires a depth buffer, this workaround can be safely applied. Task-number: QTBUG-40649 Change-Id: Id0f6e418aa5c6346186678728f88a6c18af5fb74 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* Harfbuzz-NG: Compile on WinRTEskil Abrahamsen Blomfeldt2014-08-192-2/+9
| | | | | | | | | There is no environment (like WinCE) and the basic version of InitializeCriticalSection is unsupported. Change-Id: I7c5038115f0dbfdc616bce89a9be166b5f2a1dcc Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* WinRT: Do not forget the path specificationMaurice Kalinowski2014-08-191-1/+1
| | | | | | | | The path value can be used to access any container or subcontainer in the settings, even if it is not created by Qt. Change-Id: I431d8a8b129dafb4ec85227421dc37ec76c18ecf Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* WinRT: Fix QSettings auto-testsMaurice Kalinowski2014-08-191-4/+31
| | | | | | | | | | | | WinRT is a sanboxed environment, hence files can only be created in some writable location. For some tests we reset the current directory to minimize the required changes. We cannot do this for the application lifetime as the test also has cases where it reads files relative to the executable inside the sandbox. Change-Id: Ib9d37c8cffd191f0d1055f835c11d10887923378 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
* tst_qdbusabstractadaptor: Reduce qWait() usage.Robin Burchell2014-08-191-25/+14
| | | | | | | | | | Convert qWait to QTRY_ where we can, and make the qWait durations explicit (not buried in a function call, but inline in the actual test) where we can. Total runtime for me goes from 91 seconds to 2 seconds. Change-Id: I45b3562cb94721a521718365fd51a4172a2e4e18 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* If a tess/compute shader compilation fails, print its type correctlyGiuseppe D'Angelo2014-08-181-7/+18
| | | | | Change-Id: I7536b596b890ed304846572b3068b3e932c0f594 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Giuseppe D'Angelo2014-08-1942-151/+668
|\
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-08-1242-151/+668
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manually included changes from 3a347a4e70e5a10ee92dd2578316c926a399e894 in src/opengl/qgl.cpp. Conflicts: src/opengl/qgl_qpa.cpp src/plugins/platforms/android/androidjnimain.cpp Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929
| | * Fix disconnect()ing from signals declared in a base classOlivier Goffart2014-08-112-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix disconnection from pointer to member signal that belongs to the base class, but whose type is a pointer to a member of the derived class. Commit 9cc106d9d7d951fcf30f4b0f8606afa6b50892ec fixed connect, so apply the same fix in disconnect [ChangeLog][QtCore][QObject] Fixed disconnecting from pointer to member signal that belongs in the base class but whose type is explicitly given as a pointer to a member in the derived class Task-number: QTBUG-40638 Change-Id: Ia546fc8f36e1ea0dd0645bdd820aea47f43677ac Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Doc: document that we have unfixed bugs with waitForXxx on WindowsThiago Macieira2014-08-111-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to document because we don't know how to fix the bug and don't know when they will be fixed. We should also disable the unit tests related to those functions, as they probably cause CI instability. Task-number: QTBUG-24451 Change-Id: I0e60682ec4af7570258b13735339051ba8f4a6e4 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Fix rendering alpha-blended text which needs to be clipped at the top.Simon Sasburg2014-08-111-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-34148 Change-Id: I9c0694e67cc9883db318c1a1558bdf6e08088db4 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| | * Fix build due to missing include when using a minimal config.Sérgio Martins2014-08-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QStyle is used, so include it explicitly instead of relying on indirect inclusions. Build was broken when using a bunch of QT_NO_ defines, not sure which one triggers the failure though. Change-Id: Ib07218521648448576f1b55d2d91d1711c048f09 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * Fix build with QT_NO_DRAGANDDROPSérgio Martins2014-08-111-9/+9
| | | | | | | | | | | | | | | | | | | | | viewportSizeHint() should be defined outside the QT_NO_DRAGANDDROP ifndef Change-Id: I7c23c820ea58b3614eb030dc5b0f290ad891ccb1 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * Font Database: Add support for private, system UI font familiesGabriel de Dietrich2014-08-1111-82/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We introduce QPlatformFontDatabase::isPrivateFontFamily() to allow testing for private, system UI font families. Both QFontComboBox and QFontDialog need to filter out those private font families which, by definition, should be hidden from the end user. (The textedit example had to be updated to fix the issue where the default font would be private. In 5.4, we will be adding an equivalent, public API in QFontDatabase, and a better solution for the textedit example and QTexEdit in general). In particular, on OS X and iOS, private fonts are used for the system UI font. Those have their font family name prefixed by a dot. QCoreTextFontDatabase knows about this, and makes sure those are tested positive as private font families. In order to have a cleaner layer separation, we moved the QPA theme font resolution from the platform theme classes into QCoreTextFontDatabase for both Cocoa and iOS QPA plugins. In both cases, we use CoreText's CTFontCreateUIFontForLanguage(), that nicely maps to the HITheme API we were using so far on Mac. That means one HITheme dependency less. We also cache the font descriptors we get for these font for each time QCTFD::populateFamilies() gets called. (While not common, this currently happens in auto-tests, like tst_QFontDatabase, and could happen in actual applications -- specially when adding and removing application fonts.) Change-Id: Ic6f0b60f9f597afee1a43596a669742dc546b97f Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Apply upstream patch r1498 to our PCRE copyGiuseppe D'Angelo2014-08-102-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's actually a subset of the patch (tests, docs, other whitespace fixes were dropped). Fixes a stack overflow issue on pathological regexps reported upstream: http://bugs.exim.org/show_bug.cgi?id=1515 Change-Id: Ie36536e820d79ff842d90efa6bec22b701423793 Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Apply upstream patch r1495 to our PCRE copyGiuseppe D'Angelo2014-08-102-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's actually a subset of the patch (tests, docs, other whitespace fixes were dropped). Fixes a stack overflow issue on pathological regexps reported upstream: http://bugs.exim.org/show_bug.cgi?id=1503 Change-Id: If080e4c1e7a86c86459bbbc631c8d8bb3cd7b99f Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Initialize member.Gunnar Sletta2014-08-081-0/+1
| | | | | | | | | | | | | | | Change-Id: I9ed8d5a7aeb40886bafbd9eb2003e88e5d796cc9 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * Document missing QLatin1String methodsThiago Macieira2014-08-071-0/+88
| | | | | | | | | | | | | | | | | | | | | Most of them were added before 5.0, but it's ok to just list as 5.0. Change-Id: I6e83a210a0165659f710d47ed595e9e89d5dbac9 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * network tests: add manual test for auth / proxy authPeter Hartmann2014-08-071-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is helpful to e.g. test an NTLM proxy. The test server currently does not support NTLM; this test offers a possibility to specify a proxy server via environment variables. Change-Id: Iea94656d38424c1d932fc854d13ca15ca47cdd68 Reviewed-by: Richard J. Moore <rich@kde.org>
| | * Uncomment some tests which accidently got commentedAndy Shaw2014-08-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | With SHA1 47b3ecf3f49933f2a7e3a9dd98f0641d513822bb some tests got commented out by accident. This re-enables those tests. Change-Id: If9c7d8a672b66086895a0383fe87d3101fb146fb Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| | * Both HiQualAA and normal AA should mean antialiasing in rasterengine.Gunnar Sletta2014-08-071-1/+1
| | | | | | | | | | | | | | | Change-Id: I1970c96e7681e4059984d837e12f044f138e6d7e Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * Check if Start/EndPage returns non-positive value when error checkingAndy Shaw2014-08-071-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | StartPage and EndPage are documented to return a non-positive value (0 or less) when they fail, therefore it is not enough to check if !StartPage. Checking if is 0 or less is more accurate. Change-Id: Ia0ff43da4e4309ba0a5983e91a0ad583aad0a955 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Windows: Fix stored family name of fallback fontsEskil Abrahamsen Blomfeldt2014-08-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we create fallback fonts, we copy the fontdef of the main font, but we need to update the family name to match reality, otherwise a QRawFont created with the font engine will have the wrong family name. This is already done in the default implementation of loadEngine(), but was missing from the Windows implementation. One large consequence of this was that when the distance field renderer cloned the font engine (to change its size), it would clone it with the wrong family name. When it later painted its glyph indexes, they would of course refer to the wrong font (the fallback) so random characters would appear. [ChangeLog][Windows] Fixed using QRawFont with fallback fonts, e.g. in the case of text rendering in Qt Quick. Task-number: QTBUG-39172 Change-Id: Ic8fcd9dfc20ec7aadf0b47d4a80417f401f355fd Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
| | * Android: Remove native views when their window is destroyd.Christian Strømme2014-08-061-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | destroySurface() was not removing the native view as they are not in the m_surfaces map. Task-number: QTBUG-40159 Change-Id: Ib5457e0bd34141654fa47883f5e125d894b0bd05 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Android: Fix QAndroidPlatformServices::openUrl().Christian Strømme2014-08-062-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Return true only if an activity was found for the intent. Task-number: QTBUG-34716 Change-Id: I764caf1e8afa3b17b2d71f52873c17e5d834a956 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * Android: Fix recursion bug in callStaticMethod()Christian Strømme2014-08-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | calling callStaticMethod() with template type jlong, jdouble or jboolean would cause the call to loop indefinitely. Change-Id: I99caa576e761fdef623ece04e0779e4cf2535592 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * GTK file dialog: pre-fill the filename if given to a Save dialogShawn Rutledge2014-08-061-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The docs for gtk_file_chooser_set_filename explain that if a file is new, we should call gtk_file_chooser_set_current_name instead. (But in that case it is necessary to set the directory separately.) Qt doesn't make a distinction between a save dialog for saving a new file vs. a dialog for re-saving an existing file, so it seems this is the better way to do it all the time, since a save dialog would most often be used for saving a new file. Task-number: QTBUG-40573 Change-Id: I285e898fafc54ae39f09d564ca431a279a8f8919 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * QFileDialog docs: remove misleading sentence about static functionsShawn Rutledge2014-08-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Native dialogs are used whenever possible, not just when the dialog is instantiated via the static function. Task-number: QTBUG-36657 Change-Id: Ibad67114e67f8e2f9956037f8469542c72bfd8ea Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Doc: Placed Qt OpenGL class convention in code block.Jerome Pasion2014-08-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | -QDoc tried to autolink where it should not. -The syntax looks much better in a code block than in a paragraph. Change-Id: I21d08cbb1537186d09b52898d7b70a5c0794256c Task-number: QTBUG-35019 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| | * Undo: Fix state entry bug for parallel state groupsPeter Kümmel2014-08-062-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit reverts c4cef6fae9f2a55f21fc9517855dfcf659c89081. The above fix for QTBUG-25958 (cloned in QTBUG-40219) is not complete and introduces the regression QTBUG-30049. Task-number: QTBUG-30049, QTBUG-25958, QTBUG-40219 Change-Id: I3c4b774dce06c13cb4e089f8413a7747cedfd212 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * Do not add QOffscreenSurface windows to the global listLaszlo Agocs2014-08-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QOffscreenSurface has to stay usable even after returning from app.exec(). Hence close()ing the underlying hidden window, that is used on platforms that do not provide real offscreen surfaces, is wrong. Normally all QWindows are closed (and thus destroy()'ed) when quitting the application, meaning the the offscreen surface cannot be made current anymore after returning from exec(). This is an unnecessary limitation and makes certain cleanup operations impossible. Backport of ba79f36cb1319a279068adb6d02a8993cbc62613 from dev. This is necessary for the 5.3 series too to avoid issues on exit in QQickWidget apps, on OS X in particular. Task-number: QTBUG-40505 Task-number: QTBUG-39908 Change-Id: Iea1489378a18f29ff84ba8f13a6dad2d66d2b315 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| | * tst_QHash: check which of several equal keys is insertedMarc Mutz2014-08-052-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test that checks that QHash keeps the first of the keys that compare equal. This may or may not be documented, but is inconsistent with the values in a QHash, where the last element with equal key is kept. Document this as a test. That way, we'll be informed when the behavior changes (e.g. by a port to std::unordered_map). Do the equivalent checks in tst_QMap, too. There, of course, instead of equal keys, check equivalent ones. Change-Id: I2c5f04f8e8a6bbc7dbaadadd878a4c876e4df042 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| | * OpenGL: destroy QGLContext allocated by QGLContext::fromOpenGLContextDavid Fries2014-08-053-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLContext already uses ownContext to identify when it "owns" QOpenGLContext and will delete QOpenGLContext when needed. In the other way QGLContext::fromOpenGLContext creates a QGLContext for QOpenGLContext, and is now using qGLContextDeleteFunction to identify if QOpenGLContext "owns" QGLContext by QGLContext only passing a delete function when QOpenGLContext should delete QGLContext, and by QOpenGLContext calling deleteQGLContext() from destory() to do the destruction avoiding the previous leak and sometimes crash on exit. Change-Id: I65e791776e99b456e4d0c70fc5b5cdb33c975893 Task-number: QTBUG-40286 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * tst_QSet: check which of several equal elements is insertedMarc Mutz2014-08-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test that checks that QSet keeps the first of the elements that have equal value. This is documented, but inconsistent with values in a QHash, which keeps the last element with equal key. Document this as a test. That way, we'll be informed when the behavior changes (e.g. by a port to std::unordered_set). Change-Id: I4ca1718bb86599b925b3ccd13b0856917cd4ce67 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| | * fix paths in installed qtmain.prlOswald Buddenhagen2014-08-041-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | simply make use of the infrastructure used for "proper" modules. Task-number: QTBUG-40026 Change-Id: Iffab72f7fb7a128549da2839a7497cff2f48b777 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Accessibility Linux: use Frame for WindowsFrederik Gladhorn2014-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | On Linux it's actually more common to use frame as role for windows since they are per definition normal main windows. Change-Id: Iee5bdfca139049846c1be864661231a594edf695 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | | tst_qmouseevent_modal: Replace some qWait with QTRY_VERIFY.Robin Burchell2014-08-181-8/+4
| | | | | | | | | | | | | | | | | | | | | Takes the total time for this test from ~1.2 seconds to ~0.42 seconds for me. Change-Id: I426e600a7afe01d7343108b432eda8b83d6f3d85 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Remove some manual qWait and use QTRY_VERIFY instead.Robin Burchell2014-08-181-6/+3
| | | | | | | | | | | | | | | | | | | | | This takes 300ms off the total time for this test. Change-Id: I230b8a58315797a81579f6a07da282b0dc40637d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | tst_qstatusbar: Use a timer and remove some unnecessary waits to reduce test ↵Robin Burchell2014-08-181-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | time. Time taken by this testcase reduced from 7 seconds to 5.1 seconds for me. Change-Id: I93b1c5fbc7d9d6515c9ce51a64fdd5c2ffbd54c8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Tablet manual test: show rotated ellipse if the stylus has rotationShawn Rutledge2014-08-181-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Followup to da9e02eb83ea6eecf3cdb16b11241c91f5029380: If the stylus is a Wacom Art Pen for example, the regular_widgets test will show a rotated ellipse with size proportional to pressure for each tablet point, instead of a circle. Task-number: QTBUG-39458 Change-Id: I4bbb5f8ceabf7006928d95df3ecd62378394f085 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | | tst_qwindowcontainer: Convert some QVERIFYs to QCOMPAREsRobin Burchell2014-08-181-3/+3
| | | | | | | | | | | | | | | | | | | | | So when they fail it's easier to figure out why. Change-Id: I7e76a6e0b8076ede30a6bb9049a031063c569dfc Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | tst_dialog: Convert some QVERIFY to QCOMPARE.Robin Burchell2014-08-181-2/+2
| | | | | | | | | | | | | | | Change-Id: Ibca62cf9dd2e19e32388d19f0c7b34fb7fd81268 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | tst_qlistview: Convert some qWaits into QTRY_* usage.Robin Burchell2014-08-181-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | This takes the total runtime of tst_qlistview for me from ~47 seconds to ~10 seconds. Change-Id: Ie6fe95fe0852c2de37e99c2ad02230de78e0995e Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | xcb XInput: use categorized logging for devices and eventsShawn Rutledge2014-08-183-56/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Platform Specific Changes][X11 / XCB] environment variables QT_XCB_DEBUG_XINPUT and QT_XCB_DEBUG_XINPUT_DEVICES are deprecated and replaced with logging categories qt.qpa.events.input and qt.qpa.devices respectively Change-Id: I287a56de5cb9ece2ac14df6510b9aa52c864c99b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | | Support antialias and rgba Xft settings as used by GNOME and UNITYAllan Sandfeld Jensen2014-08-185-45/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | We only parsed the hintstyle from the Xft settings. This patch adds parsing for also subpixel style and disabling antialiasing. Task-number: QTBUG-27106 Change-Id: Icdb88ccc10e50d76eb30a5b126bee7590e257022 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | | eglfs/stub: Die fatally if the framebuffer can't be opened.Robin Burchell2014-08-171-1/+3
| | | | | | | | | | | | | | | | | | | | | There's no point trying to continue, everything graphical is not going to work. Change-Id: I4c85de63746618ddf73435b491a3244b7e53a76c Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | | kms: Also initialize in resize(), if required.Robin Burchell2014-08-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | It appears to have been an incorrect assumption that flush always comes before resize. At least for me, that is not the case. It also strikes me as being more robust this way. Change-Id: Iafd2cfe7b89802899e844152e0901e588ff0d8a6 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | | GTK2 theme should use GTK configured font variantAllan Sandfeld Jensen2014-08-174-7/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes the GTK2 theme read the font configuration and use that as the default system font. Task-number: QTBUG-39643 Change-Id: Ieacf8968e54f34c6d44669350d349c9a96ed6cc5 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Android: Also support android style for debug deploymentEskil Abrahamsen Blomfeldt2014-08-161-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both bundling and debug deployment can use the local cache for the Android style assets, since Ministro is not necessarily available in these cases. Change-Id: I33367aceec1829f27377fcb6793ca95ecf5cc434 Task-number: QTBUG-40676 Reviewed-by: BogDan Vatra <bogdan@kde.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 00:01:36 +0000