summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* No need to stat with QFile::exists before QFile::open, for reading.David Faure2012-02-174-6/+6
| | | | | | Change-Id: I14ca7f8a377bca39004defc96d69d62c151181f5 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Jeremy Katz <jeremy.katz@nokia.com>
* Remove unnecessary locking from QNetworkProxy constructorShane Kearns2012-02-171-17/+6
| | | | | | | | | | | | | | | | | | | | | | | QGlobalNetworkProxy (a singleton) had two phase construction, with the second phase being called from QNetworkProxy's constructor. This isn't necessary, and has been reported as causing deadlocks. Although constructing socket engine handlers has side effects (they add themselves to a list on construction and remove themselves on destruction), this appears to be safe. The socket engine handlers are only used while holding the list mutex, and any socket engines created don't have any reference to the factory that created them. With the new version, it is possible that two instances of QHttpSocketEngineHandler and QSocks5SocketEngineHandler exist temporarily if a Q_GLOBAL_STATIC initialisation race occurs. This appears safe, because the loser of the race deletes its handlers, which remove themselves from the global list as above. Task-number: QTBUG-13088 Change-Id: I8cf520da717d8ab7d862ab89c6de13aea6d60ac3 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix warnings about missing file.Friedemann Kleint2012-02-171-1/+1
| | | | | Change-Id: I8644d2b80bab9c18f666d742da389e84bf3f124c Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
* Fix handling of urls containing username/password in QNetworkAccessManagerShane Kearns2012-02-172-10/+63
| | | | | | | | | | | | | | | | | | QNetworkAccessManager was ignoring the supplied credentials, although webkit seems to support these urls at a higher level. Following the behaviour of browsers: We use supplied credentials if authentication is required. We add supplied credentials to the authentication cache. We emit authenticationRequired signal if the credentials were wrong. We do not use previously cached credentials for that url Synchronous http requests fail, if the credentials were wrong. Task-number: QTBUG-18107 Change-Id: If46e8eab1511ba8a0f4bbe0d4efaabc4df0b8ab4 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix incorrect use of QObject::disconnect in synchronous http requestShane Kearns2012-02-171-2/+4
| | | | | | | | | In certain circumstances, this could cause the request to time out (and repeatedly send bad authentication credentials to the server) instead of failing with AuthenticationRequiredError. Change-Id: Iff66b32f1d7268f21fd77b6620aae4b5d49d857f Reviewed-by: Richard J. Moore <rich@kde.org>
* Update documentation to show NTLMv2 is supportedShane Kearns2012-02-171-4/+2
| | | | | | | | | This feature was implemented in 4.8, but documentation was not updated at the time. Task-number: QTBUG-18181 Change-Id: I657d7ab7aaf43b73b7bf8fd1cb76086522cf5c2b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QSize/QSizeF: add const versions of scale()/transpose()Marc Mutz2012-02-172-18/+85
| | | | | | | | | Non-mutating functions can (potentially) be constexpr. On top of that, they often make for more readable code. Change-Id: I3547327cf5a7162737353a864a1025d0d02ccc2f Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: David Faure <faure@kde.org>
* Make 'nmake check' succeed for widgets testsMiikka Heikkinen2012-02-1710-0/+21
| | | | | | | | | | | | | Marked a bunch of tests insignificant, and skipped one crashing test case in QApplication test, as that couldn't be made to pass simply by marking the test insignificant. Once the underlying issues are fixed, the tests need to be re-enabled. Task-number: QTBUG-24203 Change-Id: I9aea4fa207d307793445efdcaead72219fbf6c4f Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix another typo in the evdev keyboard plugin.Friedemann Kleint2012-02-171-1/+1
| | | | | | | Amend 3296b7327bd84f420df7e5561d192c0a8d0bb409 Change-Id: Ide58a6b8cbd980eda6ff91948c8f4fb45a30e527 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Widgets: Remove obsolete QGuiPlatformPlugin.Friedemann Kleint2012-02-175-248/+0
| | | | | | | | It has been superseeded by QPlatformTheme. Task-number: QTBUG-24204 Change-Id: I8c4131c7bfd8201e747984d772ed8042610192b8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Disable 'check' target generation for network autotests for Windows.Miikka Heikkinen2012-02-171-2/+2
| | | | | | | | | | A number of network autotests are unstable in Windows, so don't generate check target for them as is done for mac. Once the tests are acceptably stable, this needs to be reverted. Change-Id: I18262e28ce40eba541aecf3cfb651bff34698ead Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix "check" target when load(testcase) is used in .pro file.Miikka Heikkinen2012-02-171-2/+2
| | | | | | | | | | | | | | The "check" target always depended on debug-check on projects that explicitly loaded the testcase.prf, even if Qt was configured with -release parameter. This obviously caused build failure. Changed the testcase.prf to check which configuration is preferred using CONFIG(debug, debug|release) like is done with similar cases in other .prf files. Task-number: QTBUG-24332 Change-Id: Ib5140b106e99efe51932bdd5a48914786de23230 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Qt 5 plugin system: Fix handling of namespaced plugin classes.Friedemann Kleint2012-02-171-0/+4
| | | | | | | - Add 'using namespace' to moc code as was the case in 4.8. Change-Id: I26cba9ad74bf05eecc5205714c32c3176695e3b4 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Clean up default arch setting on Mac OS XBradley T. Hughes2012-02-172-48/+24
| | | | | | | | | | Remove config.tests/mac/defaultarch.test, but do the same type of default arch detection, only using the qmake binary instead of compiling an empty file. Qt 5 will only support 10.6 and up, which means we only support i386 and x86_64 now. Change-Id: I24949ac803b965c523b1ee45cf769e266dcde134 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Fortune client example - list all IP addressesShane Kearns2012-02-172-18/+28
| | | | | | | | | | | The first IP address on the machine might not be a usable one. Changed the QLineEdit to a QComboBox, and populated it with all IP addresses of the machine, along with the machine names if they are configured. Task-number: QTBUG-13121 Change-Id: I7c443f5ce6efb0d0b525c5abad1671d3dcbba33c Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fixed API in QWindow: visible() -> isVisible().Samuel Rødal2012-02-174-6/+14
| | | | | | Change-Id: I14706abb8441c153f738563cb1a46205fdb2dae6 QWindow::visible() did not follow the API guidelines. Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* QStandardPaths implementation configured using JSONJeremy Katz2012-02-172-0/+186
| | | | | | | | | | | | | | | | | | The default JSON file is /etc/user-dirs.json, but may be overridden by setting PATH_CONFIG_HOME to the file to be used. This provides functionality similar to the XDG based QStandardPaths, but uses a JSON file to define paths, rather than the XDG A=B format. Values other than HomeLocation and TempLocation may be specified by removing the "Location" postfix, converting to upper case, and separating words with _. Values are independent. For example, CacheLocation does not depend on GenericCacheLocation. Variables specified as ${[^{]*} will be replaced with environment variables. Change-Id: I374f5e6bae498dbfa9cb4ecadf915b05fb91fc34 Reviewed-by: David Faure <faure@kde.org>
* Windows: Fix compilation with -qtnamespaceKai Koehne2012-02-172-0/+8
| | | | | Change-Id: I00ba88887100b699d620875d868f8a769259a768 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Expect failure in tst_QStyleSheetStyle::hoverColors()Bradley T. Hughes2012-02-171-0/+5
| | | | | | | | | This is similar to the focusColors() failures in QTBUG-23686. Task-number: QTBUG-23686 Change-Id: I1f01a4e41e61a7a664309be34cfa4fe916a92b15 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip tst_QGuiApplication::focusObject() on Mac OS XBradley T. Hughes2012-02-171-0/+3
| | | | | | | | | This test fails intermittently, and at random locations. Task-number: QTBUG-24322 Change-Id: Ied6dd4d1593066debc0fb48c6ca2a17a1f4d51b7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip all tst_QFontDialog tests on Mac OS XBradley T. Hughes2012-02-171-0/+10
| | | | | | | | | All of these tests currently hang. Task-number: QTBUG-24321 Change-Id: I7664b57f6539d4c03008701da66e193019a4440a Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip hanging tst_QColorDialog test, expect failing test on Mac OS XBradley T. Hughes2012-02-171-0/+6
| | | | | | | | | | tst_QColorDialog::native_activeModalWidget() hangs, so skip this test. tst_QColorDialog::task247349_alpha() fails, so XFAIL this failure. Task-number: QTBUG-24320 Change-Id: Ie4d69e07063e9a648ec4fa3337274143a52ea3e3 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Skip hanging/failing tst_QApplication tests on Mac OS XBradley T. Hughes2012-02-172-2/+6
| | | | | | | | | | | | | | The first block of tst_QApplication::quitOnLastWindowClosed() hangs on Mac OS X, so skip that block for now. tst_QApplication::testDeleteLAter() both hangs and fails on Mac OS X, so skip the test and XFAIL the failure. Task-number: QTBUG-24318 Task-number: QTBUG-24319 Change-Id: Ice11292d84e63215f1bb9e03f3ef369943d1d887 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove unused config.tests from config.tests/mac/*Bradley T. Hughes2012-02-176-219/+0
| | | | | | | | | | | | | The xarch.test and crc.test are not run by configure, so remove them along with the related CFG_MACH_XARCH and QT_NAMESPACE_MAC_CRC configure variables. The kEventClassQt variable in qt_mac_p.h is also unused now, so remove it as well. Change-Id: I596ab9b493ce3164b6a4d40e8942479efc91b60d Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Expect tst_QSettings::ctor(native) failures on Mac OS XBradley T. Hughes2012-02-172-1/+6
| | | | | | | | | | | | | | The default constructor for QSettings does not set NoAccess status, even if the organization domain, organization name, and application name are empty. Instead of trying to fix QSettings, keep the existing behavior, and test for it. Failures from tst_QSettings no longer need to be ignored, so mac:CONFIG+=insignificant_test has been removed from the .pro file. Task-number: QTBUG-22745 Change-Id: Ic9f8b6821c483c217e1ef2ece704be2da169e340 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Add palette() and further hints to QtGui/QPlatformTheme.Friedemann Kleint2012-02-1731-239/+849
| | | | | | | | | | | | | | | | | | | | | | | | | | - Move palette() from deprecated QtWidgets/QGuiPlatformPlugin to QtGui/QPlatformTheme, Make it return a const * since QPalette does not have isNull(). - Initialize QGuiApplication::palette() and QApplication::systemPalette() from it. - Do not initialize QPalette from QGuiApplication::palette() unless app_pal is non-null (default to Qt::black if it is 0). This avoids initialization order crashes/recursions in the QPA plugin. Streamline initialization function. - Remove styleName(), systemIconThemeName() and iconSearchPaths() from QGuiPlatformPlugin and re-add them as QPlatformTheme::themeHint(). - Remove styleHint() from QGuiPlatformPlugin, add it to QPlatformTheme::themeHint(). - Add UNIX themes with factory function (Generic, KDE, Gnome), taking it from Qt 4.8 code (stripping the KDE 3 code). - Implement Windows palettes. Task-number: QTBUG-24204 Change-Id: Ie27ec035df4f84c42deaffc4816b2e53ce705462 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Plugin loader: Output offending plugin name in warning.Friedemann Kleint2012-02-171-1/+2
| | | | | Change-Id: I0aba0cf04f703b893459af55263685c5548a92f9 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Convert jpeg plugin to new formatLars Knoll2012-02-174-13/+71
| | | | | Change-Id: Icadeb366c39a71dac948904197464f7e0b4272b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Convert ico plugin to new format.Lars Knoll2012-02-174-18/+72
| | | | | Change-Id: Ib0fb7bb9f853e39cd62b693bb5b43ae15f750d84 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Convert GIF plugin to the new formatLars Knoll2012-02-174-13/+72
| | | | | Change-Id: I3adf1d2402a07213cb4cb5193c465bd820919bd1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Enables QProcess back on QNX.Rafael Roquetto2012-02-174-18/+160
| | | | | | | | | | Because fork()/vfork() on QNX are not supported on multithreaded applications, QProcess had been disabled on this platform. The corresponding code has now been replaced with functions that wrap around spawn(). Change-Id: I46091b7d41f322a5cad07d17893aa929c84941ef Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Static plugins don't break QFactoryLoader::keys()Lincoln Ramsay2012-02-171-1/+1
| | | | | | | | | | | The = means that a single, static, compat plugin replaces the list of keys (eg. from previously checked static plugins or from dynamic plugins). Using += prevents this undesirable behaviour. Change-Id: I3a40752c08dddbfe81444ca9c782b633e9742ab9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Changed qnetworkreply unittest to work from install directoryKurt Korbatits2012-02-174-289/+243
| | | | | | | | | | | | | | | | | - made subdir test depend on echo - remove SRCDIR and changed to use TESTDATA and QFINDTESTDATA - added waitForFinish() to handle slow networks - removed core module header from echo subprogram and replaced with needed header only - Added ipv6 skip to connectToIPV6Address() if not available - Added check QT_BUILD_INTERNAL and skip tests if backend not available - Skip permission tests if run as root - Removed win32 debug and release directory locations so that application is in known location relative to test data Change-Id: I58c3c2fca3cd2fee72fdb81d016bb4fd7fe08ac2 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Removed rfc3252.txt from networkselftest unittestKurt Korbatits2012-02-172-910/+0
| | | | | | | | - no longer needed after test that used it was removed Change-Id: I63fc8a9db07f9250507becb9bf6c2aefe0fdc254 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fix naming of plugins for QPA plugins and use new plugin system.Friedemann Kleint2012-02-1714-10/+37
| | | | | | | | | - Fix naming "com.nokia" -> "org.qt-project" in platform integration & platform theme. - Adapt Windows, XCB, Cocoa, Minimal. Change-Id: I7834f5c3d94473b6f06c1bffee074a70ee25f426 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove usages of QT_ARCH and QT_ARCH_* from qtbaseBradley T. Hughes2012-02-1720-38/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The architecture is detected at compile time based on the predefined macros from the compiler. Don't use QT_ARCH in .pro, .pri, or .prf files. The PNG_NO_ASSEMBLER_CODE define from libpng.pri is not present in the current copy of src/3rdparty/libpng, so no change in functionality is expected. The conditional for the SUPPORT_JIT define in pcre.pri is moved to src/3rdparty/pcre/config.h, again so that we can use the compiler's predefined macros to detect the architecture at compile time. Replace QT_ARCH_ARM, QT_ARCH_MIPS, and QT_ARCH_SPARC with their Q_PROCESSOR_* equivalents. Replace QT_ARCH_INTEGRITY, QT_ARCH_VXWORKS, and QT_ARCH_WINDOWSCE with their Q_OS_* equivalents. Note that this commit also effectively disables the SPARC atomic implementation. An inline implementation for SPARC needs to be added, or we remove the current code and instead rely on the GCC intrinsic or C++11 std::atomic support on SPARC. Note also that this commit does not remove QT_ARCH from configure or qconfig.h. This will continue to be set until all Qt 5 projects can be moved away from using QT_ARCH. Change-Id: I5de747cc4436d21941329974cff3016970f497b8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Some small doc fixes, typos and removal of one incorrect paragraphAndy Shaw2012-02-175-12/+7
| | | | | | | | | The QTextStream paragraph that is removed referred to something that is incorrect. This was confirmed for Windows, Linux and Mac. Change-Id: Ibac8f82482f2060308b5b8485d6da228bdf52fe6 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com> (cherry picked from commit 80cebfde10cf34dcc0777c24f1b3ff37cad20181)
* Don't render glyph with FT with fetchMetricsOnlyJiang Jiang2012-02-171-1/+1
| | | | | | | | | Neither rendering with outline nor fetchMetricsOnly requires the rendering from FreeType so we don't need to render them or cache it. It should speed up recalcAdvances() quite a lot. Change-Id: I0f623cb4f79da2edf6e9c9634a2f22fb0c66823c Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Ensure that QSqlDatabase::database() is still thread-safeAndy Shaw2012-02-171-4/+1
| | | | | | | | | | | | | | | | QSqlDatabase::database() is documented to be thread-safe and when the driver is queried for the numericalPrecisionPolicy set then it can comprimise the thread-safety. Since the driver itself (if one is set) will be queried for the numericalPrecisionPolicy when numericalPrecisionPolicy() is called on the QSqlDatabase then we can have it fallback to the default instead rather than taking the driver's own setting. Task-number: QTBUG-13423 (cherry picked from commit e7e9fca6c0cd1d0869029fc6e9d7605234ee5bb2) Change-Id: Ie7e9fca6c0cd1d0869029fc6e9d7605234ee5bb2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Ensure the header's context menu is in sync with the visible sectionsAndy Shaw2012-02-171-1/+12
| | | | | | | | | | | | When the filedialog was reshown the context menu for the header was not in sync with the sections that were actually visible. This ensures that it is in sync after the state of the header is restored. Task-number: QTBUG-23271 Change-Id: Ia1546bf300d43a5822482f63de99eb52b674bf52 Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com> (cherry picked from commit 2e220e4603d6a0c21efee3a884be76e9f2d7ebb7)
* Use ctest to run all tests and print output.Stephen Kelly2012-02-172-19/+68
| | | | | | Change-Id: Ib5a8513cc2d08adce49602b2590059b918b1ffda Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Only define QT_NAMESPACE if it is used.Stephen Kelly2012-02-171-2/+4
| | | | | | | | | Fixes non-namespaced builds. Change-Id: Ie743fc57e7f208fdd50c61b08dc8a4b150de3930 Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Compilation fix: missing includes for geteuid()Marc Mutz2012-02-172-0/+9
| | | | | | Change-Id: I054b8c9a398b5e192c2e005a39cba19bb4930966 Reviewed-by: David Faure <faure@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* [QTBUG-22847] Compile with C++11 compilerMarc Mutz2012-02-172-4/+4
| | | | | | | | | | | | | | C++11 supports user-defined string literals, which makes the C++98-accepted literal string concatenation sequence "foo"MACRO illegal under C++11. The solution is to add whitespace between the string literal and the macro. For symmetry, this patch adds it on both sides. Change-Id: Ie0c698f610986c4d1b12dc2083489043b696936d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* xcb: avoid use of statically-sized QListMarc Mutz2012-02-171-18/+15
| | | | | | | | | | | Change the use of QList<QPair<>> to a simple C array of xcb_keycode_t*s. This is possible since the number of elements in the container is statically known. I have not measured speedup; this is just preventing premature pessimisation. Change-Id: I8855fc8a4e7ee840d8b7497ec4166074da7d8ea8 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make sure to print short text for QSslCertifictaeExtension.Casper van Donderen2012-02-171-1/+2
| | | | | | Change-Id: If2471bea27f095352ae8c28604e104b896fd97c7 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix qlogging test for release configurationMiikka Heikkinen2012-02-172-12/+26
| | | | | | | | | | | | | | | The helper process 'app' wasn't built in release configuration. Also improved finding the helper executable to utilize QFINDTESTDATA and print out a proper errors if it could not be found or started. Note that adding ".exe" to process name in Windows is unnecessary as QProcess already does that for you, so removed the ifdeffing. Task-number: QTBUG-24330 Change-Id: Ibe75e0ecd24181ab623d0a60f17ecaf92052b0dd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QWindow-test: Fix QSignalSpy warning about Qt::ScreenOrientation.Friedemann Kleint2012-02-171-0/+3
| | | | | Change-Id: I5954445057c1a597b5062ee8e472d684832812e5 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* QMimeData: export URLs as text tooDavid Faure2012-02-172-3/+32
| | | | | | | | | | | | This allows to drop or paste them into lineedits and text widgets (including such widgets in non-Qt applications) Implementation note: this is done on-demand rather than in setUrls so that it's still possible to setText explicitely; the new code is only a fallback for when no text/plain data is available. Change-Id: Ie90c43a30bfa64a6047b627e7351d20bf5ec8e03 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove historical +1 from font height calculationEskil Abrahamsen Blomfeldt2012-02-1710-27/+22
| | | | | | | | | | | Historically, we've calculated font height as ascent+descent+1. In Qt 4, a patch was added to work around this by subtracting 1 from the descent of the font engines. We now remove the +1 and the work arounds. Change-Id: I7e25d49b97ac892015d3328f32d70eb9a7c2d88f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 21:59:46 +0000