summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * QNX: Fix compiler warning about unused variable.Sérgio Martins2014-01-121-0/+1
| | | | | | | | | | Change-Id: I16e4aa32647793bf36fee60ed94db69a6ae2d8ea Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Mac: remove unified toolbar workarounds.Morten Johan Sørvig2014-01-121-25/+2
| | | | | | | | | | | | | | | | | | | | | | QMainWindow::unifiedTitleAndToolBarOnMac() will again return true, but the new implementation is much more similar to the cross platform one so these workarounds are not needed. Task-number: QTBUG-34411 Change-Id: Ic95f491af94354776385dc984f1a00c64429a3f0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Mac: Update unified toolbar drawing code.Morten Johan Sørvig2014-01-121-3/+37
| | | | | | | | | | | | | | | | | | | | Fill the toolbar background with transparent pixels to allow the view background to shine through. Draw a separator line using HITheme. Task-number: QTBUG-34411 Change-Id: I57732564a67a5a9d1eb7fd9038382b2b65be50a4 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Fix Use android theme when definedThorsten Zachmann2014-01-111-8/+16
| | | | | | | | | | | | | | | | | | | | | | It is possible to define the theme to use for android in the AndroidManifest.xml. If it is defined in the activity qt itself should not overwrite it. The change uses the defined style in case it is given in the AndroidManifest.xml. This seems to fix also QTBUG-35151. Task-number: QTBUG-35050 Change-Id: I8b55c02ca1ecd7baa5f2f9460d154095aacf015f Reviewed-by: BogDan Vatra <bogdan@kde.org>
| * Mac: Update PE_IndicatorToolBarHandle drawing.Morten Johan Sørvig2014-01-111-8/+4
| | | | | | | | | | | | | | | | | | Smaller, rounder, darker toolbar handles. Works especially well in unified toolbar mode. Task-number: QTBUG-34411 Change-Id: I41eafdf0bb1dbbb4ed96d7bd799eb6f53bccbf7d Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Enable window dragging code in QToolBar on MacMorten Johan Sørvig2014-01-112-5/+5
| | | | | | | | | | | | | | | | | | Allows moving the window by dragging the unified title and toolbar area. Task-number: QTBUG-34411 Change-Id: Idd85c0031895b5afd7dfdc8616e4452c47935af2 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * QDate - Fix parsing Qt::ISODateJohn Layt2014-01-112-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix parsing of ISO Date from being totally lenient to being semi-strict by requiring the separator positions to be non-numeric. [ChangeLog][Important Behavior Changes] Parsing of Qt::ISODate by QDate::fromString() and QDateTime()::fromString() is not as lenient as before, the date component separators are now required to be non-numeric. This means a string like "2000901901" will no longer be recognized as a valid ISO Date, but "2000/01/01" will still be even though it doesn't strictly meet the ISO format of "2000-01-01". Task-number: QTBUG-34141 Change-Id: I0e481144136c60d4cac61364b9b2c1d2cd1e78fc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * QDateTime - Fix isValid() if invalid QTimeZoneJohn Layt2014-01-112-0/+16
| | | | | | | | | | | | | | Explicitly check that the QTimeZone is valid before trying to use it. Change-Id: Iec415a2cb07071502fe71ee5ac92a7657e818f99 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * QLocale - Check day number is validJohn Layt2014-01-111-0/+3
| | | | | | | | | | | | | | Check day number falls in valid range before using as array index. Change-Id: I8d7c203b97988633fe4c345d5e7002bba9c2c68b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Fix to comply with Qt coding guidelinesKurt Pattyn2014-01-111-32/+19
| | | | | | | | | | Change-Id: Ie6c62d3107d17e64c94fa01380b3b1d80f24d0de Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
| * Cocoa: Add setContentBorderThickness().Morten Johan Sørvig2014-01-116-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add setContentBorderThickness() to the Cocoa platform plugin. This functions requests that the platform plugin draws a gradient in the unified title and toolbar area and/or the status bar area. The background gradient is drawn before and under the Qt backing store content. It is expected that parts of the backing store will be filled with transparent pixels to allow the gradient to be visible. To facilitate this the backing store image is created with an alpha channel. Task-number: QTBUG-34411 Change-Id: Iadc5e64ee9b9b42e92fb84a615817fdffd7a8802 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| * Fix kms build with -qtnamespaceSérgio Martins2014-01-112-3/+5
| | | | | | | | | | | | Change-Id: I6aa3f3bc3c098b96ec0eec369b85a938c552f364 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| * make 'AlwaysAsk' if found help determine whether the configuration is ↵Lorn Potter2014-01-112-1/+8
| | | | | | | | | | | | | | | | | | | | | | Discovered or not. Since bearer has no idea about user interaction, we just do this, and make the roaming/always ask scenario unavailable. Change-Id: Id509a4d3346cdbb9367ddb465364c3500fc62fdf Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * fix connman QNetworkConfiguration DiscoveredLorn Potter2014-01-111-5/+7
| | | | | | | | | | | | | | | | | | | | Make Discovered depend on autoconnectable service This stops seemingly automatic use of a non autconnectable service, and allows the connection dialog to popup. Change-Id: Idea9a22eb4bbfb4fefeca7867526a2ddc3954376 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * update the network configuration listLorn Potter2014-01-114-0/+44
| | | | | | | | | | | | | | | | | | when changes in the networks happen. Task-number: QTBUG-34021 Change-Id: I2bd187e7d04d6876294f18d917c9a384afe5db35 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
| * Make qtbase compile with QT_NO_TEMPORARYFILETasuku Suzuki2014-01-101-1/+4
| | | | | | | | | | Change-Id: I0211ed44513723392e3f50b76be10b95c0bcddd5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Make qtbase compile with QT_NO_GESTURESTasuku Suzuki2014-01-103-0/+9
| | | | | | | | | | Change-Id: I90f173265e177ff37ce80da3983080651856259d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Don't force create the platform window.Morten Johan Sørvig2014-01-101-5/+0
| | | | | | | | | | | | | | | | | | | | This causes all sorts of unintended side effects and is generally a bad idea. Task-number: QTBUG-32988 Change-Id: Iebdae34764be4cfd9ced47aa93789871e0455ab3 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * network proxy tests: adapt proxy authentication to new serverPeter Hartmann2014-01-101-3/+2
| | | | | | | | | | | | | | | | The tests pass with the new test server image. Once we are using the new test server we can remove the test for the host not found error. Change-Id: Iac8ba6d8ce31b0865b33a003086aac0339afe338 Reviewed-by: Richard J. Moore <rich@kde.org>
| * Make qtbase compile with QT_NO_DOMTasuku Suzuki2014-01-101-0/+1
| | | | | | | | | | Change-Id: I98bef84ca9bf86bf7dddd3ca2a3d8210a8e46a16 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Use custom -I,-D and -L flags when building arch-testJürgen Hunold2014-01-102-3/+21
| | | | | | | | | | | | | | | | Needed for using alternate stdlib implementation like libc++ with clang. Change-Id: I1782f62f5e2ea95e6cff8a1ed646362c0a31645c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Remove #ifdef from outside test functionsThiago Macieira2014-01-102-12/+13
| | | | | | | | | | | | | | | | It's usually a bad idea to surround slots or signals with #ifdef since moc may not parse it the same way the compiler does. Change-Id: I6a3623ed7cb9fbc1b966df9d60f71b7fdf91acfe Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| * fix memory leaks in MSVC generatorsJoerg Bornemann2014-01-102-6/+8
| | | | | | | | | | Change-Id: I11bfc8259ac4e175c9ecc37d64f1d2e5037f15aa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Android: Don't crash on 100+ combo box itemsEskil Abrahamsen Blomfeldt2014-01-201-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local references are valid until the original native method returns (if it's a Java thread), or until the current thread is detached from the VM. This means that we have to manually manage local references and delete them when they are no longer in use, otherwise we will leak memory and flood JNI's local reference array. [ChangeLog][Android] Fixed crash on populating large combo boxes or menus. Task-number: QTBUG-36074 Change-Id: I7095bd1472f759be98183737a8d3912fa9763f30 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* | Make xcb QPA plugin link on FreeBSDGabriel de Dietrich2014-01-201-1/+1
| | | | | | | | | | | | | | | | dlopen, etc. are defined in libc on FreeBSD. Change-Id: Iad47113ec77029f8e300e4f08f454d70b3070b5a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Revert commit 0893d2d7e5cadcbea5caca8a027ae3e28b6c5410Louai Al-Khanji2014-01-201-4/+2
| | | | | | | | | | | | | | | | | | Commit 0893d2d7e5cadcbea5caca8a027ae3e28b6c5410 causes a lot of build warnings on Windows with MSVC. Change-Id: Ic857b36bf77d4f536a45cec337f4b813b9974107 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* | introduce qlalr featureOswald Buddenhagen2014-01-201-0/+49
| | | | | | | | | | | | | | | | this makes it possible to compile grammars at build time. Change-Id: Ia74383c4f29873ee7324bd5f14d72ef14faef460 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | move and build qlalrOswald Buddenhagen2014-01-2040-9/+14
| | | | | | | | | | Change-Id: I852e1a33fc056a52f6dbba8aaf7dd75274bbe815 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | port to std::algorithmOswald Buddenhagen2014-01-203-6/+7
| | | | | | | | | | Change-Id: I537b9ffc3eed0891bed0fcae3e0d79d70cc46cec Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | fix includesOswald Buddenhagen2014-01-2013-38/+48
| | | | | | | | | | | | | | | | use style suitable for bootstrapping. while we're at it, order the includes the usual way. Change-Id: I4fe96bfb73442c8a5de6dfe52d1a8c7eb22104c8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | re-import qlalr into qtbaseOswald Buddenhagen2014-01-2039-0/+6979
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we have a bunch of qlalr-generated sources all over the place. it would be much nicer to actually generate them at build time, rather than checking them in. this obviously requires building qlalr early on ... this commit restores the sources at their pre-modularization location and makes no attempt at integrating them into the build process yet. this is a measure to overcome git stupidity. this imports qt/qlalr at commit 4071d86e82b299f26e335a7faf662b5a676e2279 with some style fixes on top. Change-Id: I83472bc492440ecb96a8a0d5bf74cf968a1e17d2 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Don't scan system includes for dependencies and don't list themThiago Macieira2014-01-202-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume that C and C++ headers found in system paths will not change, so we don't need to tell Make about them, nor do we need to scan their contents either. The previous qmake behavior matched gcc's -M switch; it now matches the -MM switch: -M Instead of outputting the result of preprocessing, output a rule suitable for make describing the dependencies of the main source file. -MM Like -M but do not mention header files that are found in system header directories, nor header files that are included, directly or indirectly, from such a header. This goes hand-in-hand with our use of -isystem to pass system paths to the compiler. Change-Id: I3346b6da496fe6495ac89c5286d066b343116f0e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Add support for using -isystem in qmakeThiago Macieira2014-01-209-3/+51
| | | | | | | | | | | | | | | | | | This commit will make qmake use -isystem automatically for any compilers that declare support for it for any paths that are listed in QMAKE_DEFAULT_INCDIRS. Change-Id: I36fefc6d5bba61671f65669f0ea42704b3c3cf31 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 23:56:59 +0000