summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make conversion of semi-transparency to opaque formats consistentAllan Sandfeld Jensen2014-01-202-32/+63
| | | | | | | | | | | | | | Currently the non-standard opaque formats all perform inverse premultiply on semi transparent pixels when saving. This is only performed on RGB16 and RGB32 when explicitly converting to the formats, but not when drawing. This patch changes the conversion to be consistent across the board so less common formats are treated the same as the most common ones. This also makes drawing and converting to the these formats much faster. Task-number: QTBUG-36143 Change-Id: I877ddb1c1dbb4d2dd9b4b9192525e50375a1ae60 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Reduce code duplicationKonstantin Ritt2014-01-202-15/+4
| | | | | Change-Id: I077963fcb910fa705b087e35e99cd07436c034b1 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add convenience method QTextFormat::isEmpty()Konstantin Ritt2014-01-202-0/+10
| | | | | Change-Id: I30e74de6853908d1fec399131637848e3c2faabe Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* iOS: Fix simulator build by enabling SSE2 code pathsTor Arne Vestbø2014-01-182-9/+12
| | | | | | | | | | | Commit 3c375a76a13e151496ccfea0a2b3ff9fdc75784f enabled SSE2 in Qt, but we failed to build the files that implemented the SSE2 specific drawhelpers and image functions. Since we know what the iOS simulator supports and the platforms it runs on we can safely enable this ourselves without it being based on a configure test. Change-Id: I0cfc43de80068b89aa47c34ffa84ee1c1734886c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Add generic inplace converterAllan Sandfeld Jensen2014-01-183-0/+37
| | | | | | | | | | | | The generic converter can easily be modified to work inplace. Such an inplace converter can ensure we can do direct conversion between formats of similar pixel depth. Inplace conversion is currently only used by QPixmaps, but will be used by ref qualified versions of QImage::convertToFormat in a future patch. Change-Id: Idbdaf087b53deecdee8258ba0b5d80edd37cfe79 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Optimize blend_transformed_tiled_argb().Sami Liedes2014-01-181-6/+14
| | | | | | | | | | | | Profiling indicates that this function is one of two hot spots causing a noticeable latency when changing KDE virtual desktops. Instead of computing two modulos per pixel in the inner loop, it is possible to compute the modulos outside the loop and compute a modulo sum in the inner loop for a reasonable speedup. Change-Id: Ic4217b7686e031d7673b3e10aa977dae263096dc Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* QNX: Fix build on BB10 caused by missing linux fbWolfgang Bremer2014-01-181-2/+2
| | | | | | | | QNX/BB10 does not support linux framebuffer Change-Id: Ic25f69fc16cbcd27cbaa6db08c2b6556e4def965 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Introduce function for standard button texts to QPlatformTheme.Friedemann Kleint2014-01-1813-133/+133
| | | | | Change-Id: I91eec04a95b5047d893490a70152237b2991f662 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Testlib/generate_expected_output.py: Fix encoding.Friedemann Kleint2014-01-181-1/+1
| | | | | | | | | | | | | | | Do not apply additional encoding when reading process output. Fixes errors when encountering UTF-8: Traceback (most recent call last): File "./generate_expected_output.py", line 117, in <module> generateTestData(path) File "./generate_expected_output.py", line 106, in generateTestData out.write(data.decode('utf-8')) UnicodeEncodeError: 'ascii' codec can't encode character u'\xdc' in position 5485: ordinal not in range(128) Change-Id: Ib827787a59a18b4d3d0601645856517f43c01fc3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Testlib/generate_expected_output.py: Pass tests as command line arguments.Friedemann Kleint2014-01-181-3/+8
| | | | | | | Evaluate command line arguments and use directories only when empty. Change-Id: I818ec13c686018a3f607e91174e57d8f8bbf15f7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QNX: Allow creation of parentless child windowsRoger Maclean2014-01-181-3/+12
| | | | | | | | | | | | | | | | | | | | | There is no reason why a parentless window from a Qt perspective needs to be a screen application window. There are some cases, such as the BB10 dialog service whose windows are always parented by a window in another process. Ideally one would have a means to indicate a child window was wanted that had no other side effect (i.e. the rest of Qt would ignore). The use of Qt::Dialog is not ideal as some code does pay attention to this type given the number of bits available for window type, it is not reasonable to add a new one. The use of Qt::Dialog seems safe since it is hard to conceive of a window of type Qt::Dialog wanting to be a top level window. If in future it is required to have a parentless, child window that is not of type Qt::Dialog one can simply define some additional way of signalling this. Change-Id: Ie7035980ac2efd5bc722a8371c834f21ea7755f4 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Abuse const_cast in QStringBuilder to get a little more performanceThiago Macieira2014-01-181-1/+3
| | | | | | | | | | | | Without this const_cast, the call to QString::data() or QByteArray::data() will cause a call to detach(), which is totally unnecessary since we've just allocated data a couple of lines before. Since we know we're the owner of the only reference, we can skip the detach attempt. Change-Id: If40f66100f85cc9b405025f21c562828ead23475 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Improve caching in ensureColumnAndRowData()Jan Arve Saether2014-01-182-1/+14
| | | | | Change-Id: I02d9f818f8e1d6fcb8c25d1b73c08171cfc1f74d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* d3dcompiler_qt: Place compiler options in the shader file nameAndrew Knight2014-01-182-14/+36
| | | | | | | | | | | | | | | | The compiler service needs to know what options to pass to the compiler, and these options can affect the outcome of the shader blob. Runtime compiled shader output must match this file name in the binary directory. Pre-compiled shader blobs (e.g. those placed in a resource file) are permitted to drop options from the file name if the implementor can ensure the blob is compatible with the target. Defines are not written out as options, but written into the shader source, and therefore affect the cache key. Change-Id: I11e4a43fcf6818ddb29aca5eba3d8647ba4021a1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Update test result generator script to set duration to 0Frederik Gladhorn2014-01-181-1/+1
| | | | | | | | The actual code in testlib now indents the duration tag when it is for a function. Change-Id: Iee62db9c81f11dc54e57f166bf9fb2b7012b7e03 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Don't pass -mfpmath=sse to Clang < 3.4, it's not supportedTor Arne Vestbø2014-01-181-1/+11
| | | | | Change-Id: I875f72802d8745488d34f836818b21aafe69dcff Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QNX: Avoid crashing on exit when have a cover windowRoger Maclean2014-01-171-0/+3
| | | | | | | | | | | QQnxScreen destructor was leaving the cover window to a reference to it leading to a crash when the cover window itself was destroyed. Change-Id: Id82097d54fea79b0b9ec1cef439bd704da9ca453 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* QNX: Make window groups work reliablyRoger Maclean2014-01-174-13/+50
| | | | | | | | | | | | | | | | | | | | | | | | Window group related code worked previously only for the 'root' window and other windows that had no parents (which then joined the window group of the root). Introduced a new function joinGroup that makes the group related calls, this can both join and leave groups. Default group joining is performed in setVisible now rather than setScreen. The advantage of setVisible is that one can rely on it getting called at some point but it is also possible to create and interact with a QQnxWindow before it is called. This allows the default group handling to be overridden via the native interface. If the group is set (or explicitly not set) then the default handling is not done. joinGroup is also called from setParent so that if the parent window is changed the window joins the parent group. Change-Id: I03e3801ecb4e4cf901c02e45f00472a87692c2ec Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* qmake: cleanup DISTFILESJ-P Nurmi2014-01-172-3/+6
| | | | | | | | | Do not include the project file twice or other .pr? files outside the project tree. Task-number: QTBUG-21910 Change-Id: I62af842282ccdc5b9099d9227d5395ebe3f0698c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* eglfs: Move reusable functionality to eglconvenienceLaszlo Agocs2014-01-1733-731/+1288
| | | | | | | | | | | | | | | | | | | | | | | | The cursor implementation is generic GL(ES) code that should be shared by all the present and future egl-based embedded platform plugins. Follow the pattern of QEGLPlatformContext and move this class into eglconvenience as QEGLPlatformCursor. Similarly, the common bits from the context implementation context are moved back to EGLPlatformContext. eglconvenience has now base classes for integration, screen, window, etc. too. By using these, eglfs becomes much smaller and cleaner. This also paves the way for creating new, separate EGL-based platform plugins for Android, embedded Linux, etc. Also added some documentation to each of the base classes. devicediscovery is now fixed to be usable on any platform. The implementation in this case is naturally a dummy one. This finally allows using it from anywhere without myriads of ugly ifdefs. Change-Id: I02946e360c04e02de7fe234a23a08320eff4ccf5 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Fix BlackBerry10 build on NDKs prior to 10.2.1Wolfgang Bremer2014-01-171-0/+7
| | | | | | | | | | | | | | | | This commit adds a dependency checking for a recently introduced define. On NDKs 10.2.1 and later it compiles with support for VIRTUALKEYBOARD_LAYOUT_ALPHANUMERIC. NDKs 10.2.0 and earlier do not know this define and therefore it will be ignored. This is necessary because there is no newer NDK publicly available than 10.2.0. Assuming pure QNX SDKs are missing the define completely, we are only including it on recent BB NDKs. Change-Id: I6f814e5c2d77c50edf8534f3567b157f71147555 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Cocoa Helpers: Add qt_mac_flipRect(const QRect &)Gabriel de Dietrich2014-01-172-0/+7
| | | | | | | Task-number: QTBUG-33082 Change-Id: If72b2744d3694b3899c124c7a6a6ccc6e6397165 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Replace win32-g++ with mingw scopeKai Koehne2014-01-1732-34/+34
| | | | | | | | Commit 773dd01 introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. Change-Id: Ie3a9cb791a83f7c8a51bc4e23069190c452ab521 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QObject: fix connection to function pointer with non-copyable references ↵Olivier Goffart2014-01-172-2/+16
| | | | | | | | | | | | | argument For example, QObject is non copyable (its copy constructor is deleted or private via Q_DISABLE_COPY). It should still be allowed to pass a reference to a QObject as an argument to as signal (or slot). This fixes a compilation failure. Task-number: QTBUG-36119 Change-Id: I9bcf477e347d69fdae2543c99781b6421883be78 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* iOS: Fix compilation of some basic testsTor Arne Vestbø2014-01-172-2/+6
| | | | | | | | | The tests themselves may not actually pass, but it's a start, and allows us to sanity-build a few things in the CI that actually produces a final binary. Change-Id: I02643b6ffa1522de1a7d17d737c8ab45ffac6a93 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* iOS: Remove unused fileTor Arne Vestbø2014-01-172-72/+0
| | | | | Change-Id: If082be4b5c50cd5e1d5660bbe26136b9a0ee0352 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Improve code in sizeHint()Jan Arve Saether2014-01-171-30/+9
| | | | | | | | The plan is to do better caching in ensureColumnAndRowData(), and this patch will benefit for any such changes later Change-Id: Id1662e3fe7f70079e29ddb6e3d64e6e580ad9e0f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* qmake: prepare TARGET/VERSION/DISTFILES for sub targetsJ-P Nurmi2014-01-172-18/+19
| | | | | | | | | | | | | This is a preparation step for 'make dist' target for subdir projects. UnixMakefileGenerator needs these variables while extending writeSubTargets() and writeDefaultVariables() for 'make dist'. Partial cherry-pick of https://qt.gitorious.org/qt/jpnurmi-qt/commit/8c4ef19 Task-number: QTBUG-21910 Change-Id: I02a616a98448bc3041ef0f4fd034bfb4c2199e41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QNX: Fixed window positioningBernd Weimer2014-01-172-36/+4
| | | | | | | | | | Child windows have to keep their relative position when the parent is moved. Change-Id: I7d24d67578c9aaa332136d18ad9b478b120e4696 Reviewed-by: Roger Maclean <rmaclean@qnx.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Support multiple native surfaces on Android.BogDan Vatra2014-01-1767-1297/+1383
| | | | | | | | | | | | | | | | Support for multiple native surfaces is needed by applications that need to mix raster windows with GL windows. Rework the raster and opengl implementation, get rid of eglfs and fbconvenience dependencies. Create a single android platform plugin. [ChangeLog][Android] Rework the raster and opengl implementation. [ChangeLog][Android] Create a single android platform plugin. Task-number: QTBUG-34650 Change-Id: I9b1ab51554823329dda8cfbf8fef27c38f917c7b Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QNX: Fixed some window issuesBernd Weimer2014-01-172-6/+11
| | | | | | | | Corrected EGL error code query and cover windows creation in the "no-rootwindow" case. Change-Id: I86aaa4b59283f7153f8ab63c5bf231bc9da7538c Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Suppress warnings for Qt builds only.Kurt Pattyn2014-01-171-2/+4
| | | | | | | | Qt should not dictate which warnings are disabled for client code. Therefore warnings will only be suppressed when building Qt. Change-Id: I1c470ba346c8272bae2a38385e425afa6eb50170 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QWizard: Fix frame when using Vista style/MSVC2012Friedemann Kleint2014-01-172-8/+30
| | | | | | | | | | | | | Work around GetSystemMetrics() returning the wrong value using MSVC2012 and later. The special handling of Windows 8 and later is then no longer required. [ChangeLog][QtWidgets][QWizard] Fixed frame when using Vista style/MSVC2012. Task-number: QTBUG-36192 Change-Id: I39c2ab70a266f12cd65fa740b10b86edffa60417 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* iOS: Don't try to use NEON drawhelpers, we don't build themTor Arne Vestbø2014-01-161-0/+7
| | | | | | | | | | | On iOS we don't build the NEON drawhelpers as they are implemented using GAS syntax assembly, so prevent drawhelpers.cpp from trying to use them. Follow-up to 01c59ac857927043e49d4725062faea715ed49a3. Change-Id: I3e3dc9b0e1d780db3184413d2ff3010ac8dcd37b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove last traces of QT_COMPILER_SUPPORTS_NEONTor Arne Vestbø2014-01-168-13/+10
| | | | | | | | | | | Fixes ARM build, as the NEON drawhelpers and image conversion functions were ifdef'ed out. Follow-up to 1b12c0608be2359baa2f96ae28b135a84abd388c. Change-Id: I0b5e89c8f445741432db2dfe1f8d971b971c8605 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* iOS: Prevent trying to use both libc++ and libstdc++Tor Arne Vestbø2014-01-161-1/+1
| | | | | | | | Static builds of Qt will automatically enable C++11 for all projects, but this happens in mac/default_post which is after our check. Change-Id: I22a01e5d876242263fa31f8a404a65905c6c1877 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Added constructor to QJsonValue for const char *Matt Broadstone2014-01-163-3/+32
| | | | | | | | | | | | | | | | For convenience, it reads more easily (and is somewhat expected) to be able to add a string to a QJsonArray like you might with a QVariantList: QJsonArray() << "string". Previously, QJsonValue provided a private void* ctor to explicitly deny this case because it would implicitly convert to a boolean. This ctor provides a const char* ctor (much like QVariant) that interprets the incoming text as utf8 and creates a String type QJsonValue. [ChangeLog][QtCore][QJsonValue] Added constructor to QJsonValue for const char * Change-Id: Icafa954d3da1fb264f9d0fd7cd1a1d2fbbe15095 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Added convenience methods to QJsonArray for appending QJsonValuesMatt Broadstone2014-01-163-0/+48
| | | | | | | | | | | operators for +, +=, and << were added to QJsonArray to make it easier to work with, and more closely resemble the Qt container classes [ChangeLog][QtCore][QJsonArray] Added convenience methods to QJsonArray for appending QJsonValues Change-Id: I96e0a43015f7c0f980cbbef7f20bd2085ee04795 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add detection of C++1y features (probably C++14)Thiago Macieira2014-01-161-0/+64
| | | | | | | | | | | | | | | I've added the most interesting features. I've skipped three features that GCC and Clang will support: N3323 contextual conversion tweaks N3653 member initialisers and aggregates N3664 clarifying memory allocation Of those, only N3653 brings a new syntax, so it could be added later. Change-Id: I8314d81e028c9fb22052f73961c81cdc69c1461e Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Optimize INV_PREMULAllan Sandfeld Jensen2014-01-162-7/+11
| | | | | | | | | | | | | | | | Our inverse premultiply is rather unoptimized. It's major weakness is using three divide operation which are the slowest integer operations. This patch reduces the three divisions to just one but using an approximation that is accurate for all uchar values. The patch also adds a general short-cut for alpha==255. Together these improvements makes it 2 to 16 times faster depending on how many 0 and 255 alpha values are encountered. Change-Id: I96d7098a1bc320793b0d0526637acd1fdb5a43eb Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Ensure that the mkspec and source dirs are passed to moc on WindowsThiago Macieira2014-01-161-3/+3
| | | | | | | | | Those paths need not be in INCLUDEPATH: qmake always adds them to the compiler command-line and we should match the behavior if we expand INCLUDEPATH here. Change-Id: I89508d15ac534b54ae873a42c4ad9764408042b5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Automatically turn on SSE2 code generation throughout QtThiago Macieira2014-01-161-0/+17
| | | | | | | | | | | | | | | | | | | | | | ...unless the user passed the -no-sse2 option to the compiler. [ChangeLog][Important Behavior Changes] Qt now automatically generates code for processors supporting SSE2 on i386 platforms. To disable this, pass the -no-sse2 option during Qt configuration. Since this feature has been present on CPUs for 10 years and since Qt no longer checks for runtime support for SSE2, we strongly encourage users to leave the default setting on for best performance. - For Linux distributions that must retain support for CPUs without SSE2, we recommend doing two builds of Qt and installing the SSE2-enabled libraries in the LIBDIR/sse2 directory. Tools, plugins, and examples are not affected. - See discussion on the Qt development mailing list: http://lists.qt-project.org/pipermail/development/2013-November/014085.html Change-Id: I7f9b1f58a9f66b6e5fe295bac15f87d34343695e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Make qt_memfill{16,32} unconditionalThiago Macieira2014-01-165-40/+23
| | | | | | | | | | | | | These two functions used to cause a runtime detection of the CPU features in order to improve their performance. Since the last two commits, there's no runtime detection of either SSE2 or Neon support, so there's no point in attempting runtime detection. Task-number: QTBUG-30440 Change-Id: I54fe92787c983003c2cc867ee636daec30063033 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove runtime detection of Neon on ARM CPUsThiago Macieira2014-01-1610-122/+42
| | | | | | | | | | | | | Now the only way to enable Neon support is to change the mkspec. [ChangeLog][Important Behavior Changes] Qt no longer checks for support for the Neon FPU on ARM platforms at runtime. Code optimized for Neon must be enabled unconditionally at compile time by ensuring the compiler supports Neon. You may need to edit your mkspec for that. Task-number: QTBUG-30440 Change-Id: I4df9b2bf3cd022f8ed70f02f16878cb2cb3fe6fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove runtime detection of SSE2Thiago Macieira2014-01-166-85/+72
| | | | | | | | | | | | | | | | | | If the compiler supports SSE2, we'll use our SSE2-optimised code unconditionally. Runtime detection is left for SSSE3 code. The SSE2 codebase is big and thus a timebomb if an inline function gets leaked out and run without runtime check. In reality, it's extremely unlikely people running CPUs without SSE2 support are running Qt 5 at this moment (they're either too old or too new, e.g. Intel Quark). The SSSE3 codebase is a lot more manageable. Task-number: QTBUG-30440 Change-Id: I3e586e4434e820365d5316b650ee3061d0acf767 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* remove qt_windows.h from qwinoverlappedionotifier_p.hJoerg Bornemann2014-01-155-8/+12
| | | | | | | Preparation for making QWinOverlappedIoNotifier public. Change-Id: Id443514a134b5c13e64d4d89450a7912ab38d40f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* constify some functions to improve readabilityJan Arve Saether2014-01-152-4/+4
| | | | | Change-Id: I4a5e68367f281f743a631272f57a848dc2833d12 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove unimplemented constructor in QTextEngineEskil Abrahamsen Blomfeldt2014-01-151-1/+0
| | | | | | | | | QTextEngine(LayoutData*) declaration seems to have been added in Qt 4.1 without an implementation. As far as I can see it has never been implemented. Change-Id: I4bbf032395f7c930c9e8d365cdbbcf47bb118d64 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Windows: Remove rarely used integration/theming logging categories.Friedemann Kleint2014-01-157-30/+6
| | | | | | | | Preparing the introduction of the categorized logging system for the plugin. Change-Id: I2b180d88cf508559f495d39d4e1d36b8f3da7051 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Mark error message in qfsfileengine_unix.cpp as translatable.Friedemann Kleint2014-01-151-2/+13
| | | | | | Task-number: QTBUG-35594 Change-Id: I7aeab890a5972813f38370ff20f5b68839833e3b Reviewed-by: David Faure <david.faure@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 23:45:28 +0000