summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove legacy font cache from 3rdpartyDonald Carr2012-03-2239-986075/+0
| | | | | Change-Id: I5a02251565c0c72e8762c0b41cdf5802c7df1938 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix cross-compilation that uses fontconfig / freetypeThiago Macieira2012-03-222-27/+28
| | | | | | | | | | | | config.tests/unix/freetype.pri has a !cross_compile flag, so we must find freetype using the proper detection methods. The detection was inside an X11 section of configure, so move that out. And use the results of that detection, now that QMAKE_CFLAGS_X11 isn't used (since we're not building X11 in QtPlatformSupport). Change-Id: Ic8f5cfb7263849bfb12967756def2b5aaa244872 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix the bsymbolic_functions test and improve the error reportingThiago Macieira2012-03-223-2/+18
| | | | | | | | | | | The bsymbolic_functions test was missing $SYSROOT_FLAG, so the linking was always failing and the test falsely negative. Also make the error reporting better: if the flag was requested, error out if the check fails and report more information in -v mode. Change-Id: Ie2615f8083e7e58d63d9ee9c23be937dc864b30d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update the Linux-ICC mkspecThiago Macieira2012-03-221-9/+1
| | | | | | | | | | | Include linux.conf instead of unix.conf, so it can compile Qt Base these days (otherwise, we get an error from wayland-scanner.prf). Remove the outdated information from the header. The mkspec now matches ICC 12, not 10 and there are more diagnostics we disable. Change-Id: Ic75593759a4d53f859a9a9e919d77b5c52d01024 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make tst_qmovie work in shadow buildsThiago Macieira2012-03-221-2/+2
| | | | | Change-Id: I8fe4b5e98ce2fb1ac8420bf568f5c9c973165fbf Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make QNX virtual keyboard handling main event loop drivenKevin Krammer2012-03-222-90/+92
| | | | | | | | | | | | Refactor from polling in an endless loop running in a separate thread to using a QSocketNotifier working on the main thread. Similar to "de-threading" of the navigator event handling in 9dc86ac0f2d019f93665c1ae0e3c2cd33fd88bce Change-Id: I994dceed07312a3846737c8bea34cffa4ab408f1 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix QSysInfo::WindowsVersion checking (QSysInfo::WV_NT_based is a mask)Joerg Bornemann2012-03-228-14/+14
| | | | | | | | Manual merge of the original fix 1ef309e9 in the Qt 4.8 repo. Task-number: QTBUG-20480 Change-Id: Id08500c2dd16965af3942e65cff1f4afa24180b0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Add x86_64 to CONFIG on Mac OSX only when not cross-compilingSean Harmer2012-03-221-1/+1
| | | | | | Change-Id: Idd066010334999376d8b2c9619d797e4eb1f1153 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Set absolute_library_soname on mac only when not cross-compilingSean Harmer2012-03-221-1/+1
| | | | | | Change-Id: I24a2b70a515483d9d0990f66bff2b37df72faf17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* QSql*Model: add SQL syntax helperMark Brand2012-03-224-86/+97
| | | | | Change-Id: Ia53e30d7a2f2bb5b4f76c32fcf0fe526d1e4ab51 Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
* QSqlTM/QSqlRTM: improve style and readabilityMark Brand2012-03-222-86/+63
| | | | | | | | | | | | | | | | | | | | | | | General changes: const, scope, braces, hash[] for clarity, comment wording and spelling. QSqlRelationalTableModel::selectStatement() readability: Renamed private method. QVector<Class>.value() already defaults to null object value, so there is no point in handling this case explicitly. Alias rec for d->rec added more noise than clarity. Using "tables" list only adds an extra step. Simple concatenation does the trick. Deduplicate code for building table expression and JOIN condition. Change-Id: Ia52afaf3c3937a26595d5ae867982664002562d8 Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
* QSqlRTM: fix whitespaceMark Brand2012-03-221-3/+3
| | | | | Change-Id: I0ed9ab93657d35a0e8c74469f72c77fe1fc4c7c1 Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
* Fixed QInputMethod API to use isVisible() instead of visible().Samuel Rødal2012-03-223-10/+14
| | | | | | | | Deprecate the old API for now as not to break existing usages. Change-Id: I7abbbbe8a34951282537a9d74cded03743f44df7 Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* FocusAboutToChange event to be send before focus changesPekka Vuorela2012-03-228-52/+159
| | | | | | | | | | | | | | Focus change happen as: FocusAboutToChange event -> focus change -> FocusOut event -> FocusIn event. Input method need to have focus when calling commit(). Notification on focus about to be lost allows QWindow implementations to commit in time. Also changes QWidget documentation to match code reality. Change-Id: I17a8a374a33dd700909f79e370b42348869261a6 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Correctly export GL graphics engine for use in pluginsDonald Carr2012-03-222-2/+2
| | | | | | | | EGLFS and QNX both reference this symbol, hence it needs to be exported Change-Id: I11b2b8ad5f2b81d951173f7cd8a7fbb8be4bb89b Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make comment() work in the C locale too.David Faure2012-03-222-2/+3
| | | | | | | | | The parser makes the default language en_US, and no mimetype xml says <comment xml:lang="C">, so use the en_US string for the C locale, rather than returning an empty string. Change-Id: Iad7c142e8078abe357773249416e7ce9b3e29a92 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Return all expected paths in QStandardPaths::standardLocationsDavid Faure2012-03-222-53/+126
| | | | | | | | ApplicationsLocation and DataLocation were returning only the local path, rather than system paths + local path. Change-Id: I653d14e5bbe1e08c5fa1ecd5a6106336d1cd0369 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't do anything if setting the same proxy factory.Xizhi Zhu2012-03-221-0/+2
| | | | | | | | Otherwise, it crashes if you simply set the same proxy factory instance twice. Change-Id: I4b1f1d0eed7630c9a145c0a330c6be1b3fc381e5 Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* Cocoa: fix setting color with alpha channel value for color dialogTeemu Katajisto2012-03-222-3/+5
| | | | | | | | | | | Make sure that if ShowAlphaChannel option is set then also setShowsAlpha needs to be set for the panel before setting the current color, otherwise alpha channel value is omitted. Task-number: QTBUG-24320 Change-Id: Ifb3822711af8ffd0cf6cb4c8aab2b0020d296663 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Update QtXmlPatterns module name in documentationHonglei Zhang2012-03-221-1/+1
| | | | | | | | | | According to new module name convention, QtXmlPatterns is replaced with Qt XML Patterns in all documentation. Task-number: QTBUG-24775 Change-Id: I9ca85728e266bd1ca9fa7a14e5e68c43c8d3e826 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Need to check new rotation against initial rotation instead of currentKevin Krammer2012-03-221-1/+1
| | | | | | | | | Only swap width/height of initial geometry if orthogonal to initial rotation not orthogonal to current rotation Change-Id: I825954e98dee6c0d07a284307dfb8e1f9fd538e6 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Sean Harmer <sh@theharmers.co.uk>
* Show correct origin of Q_ASSERT in Windows dialogKai Koehne2012-03-221-3/+3
| | | | | | | | Display the actual file and line where the Q_ASSERT statement was triggered. Change-Id: I54d72f4c4bd9edee744c0f6e08f31b8e3120f454 Reviewed-by: David Faure <faure@kde.org>
* Remove redundant \since 5.0Debao Zhang2012-03-223-14/+0
| | | | | | | | | | \since 5.0 has been add to the class section, so member functions and properties donot need this any more. see SHA: 5728c8a8e7c994b931d340315c241350d646f62a Change-Id: I4e67461373dda99ee1fbfdeb6477fde1dcfec116 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fixed path in qobject unittestKurt Korbatits2012-03-221-1/+1
| | | | | | | - Fixed path was failing to find sub program. Change-Id: I86f1a6941e244c9bc25ad0441cc7a441607560b7 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Changed installTestHelperApp() to use relative paths to buildKurt Korbatits2012-03-221-1/+1
| | | | | | | | - Changed installTestHelperApp() to use OUT_PWD path to find files. (was looking in source tree instead of build) Change-Id: If795c17a76aebcfbbe0d4f84c5df784a255ddb19 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Use delete[] instead of delete.Sergio Martins2012-03-221-1/+1
| | | | | Change-Id: Idfa039a56ce0f7af92e91ec1657d91c79c400d6c Reviewed-by: David Faure <faure@kde.org>
* Added extra tests to json benchmarkKurt Korbatits2012-03-221-0/+32
| | | | | | | | | | - Added toByteArray() and fromByteArray() benchmark tests. Performance tests to measure QVariantMap to bytearray and bytearray to QVariantMap. Use case: Interprocess communications via local socket Change-Id: If5e94ff870890b2ebb665f3cc38f5c33b34547f4 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QDoc: updating manual to use "type".Jerome Pasion2012-03-214-62/+63
| | | | | | | | | -updated both QDoc manual and QDoc guide -"QML element" and "QML component" should be "QML type" Change-Id: Ib2a0e8baa9087a04d35c05bbbd35852da10faf42 Reviewed-by: Martin Smith <martin.smith@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* qdoc: Disable generation of .pageindex file.Casper van Donderen2012-03-212-227/+0
| | | | | | | | | | The .pageindex file was generated for the search engine on the doc.qt.nokia.com website, since this website is not used anymore there is no use for the .pageindex file. Task-number: QTBUG-24911 Change-Id: Ie74f569ce881ab383d83ac9c5a8bc223da91564a Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Use main thread event loop for navigator event processingKevin Krammer2012-03-215-72/+55
| | | | | | | | | Removes the need for an extra thread by creating the event handler's socket notifier in the context of the main thread. Change-Id: If8c7bb986074083b5b9a7b9c96734a970ba32f92 Reviewed-by: Sean Harmer <sh@theharmers.co.uk> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Remove Q_WS_X11Frederik Gladhorn2012-03-211-6/+0
| | | | | | | The define is removed and only adds includes. Change-Id: Id6cc32aa22536f78bb5de10cb779a3168e79441a Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
* Fix QWidgetTextController issue when used with QtQuick1 TextEditPekka Vuorela2012-03-211-2/+2
| | | | | | | | | Calling QInputMethod::invokeAction() was not checking for proper event type and was requiring context widget unnecessarily. Fixes some parts of QTBUG-24035 Change-Id: I51fe9ed02a018ced36319eb672a088503649b275 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix directories never being unwatched after deletion on Windows.Robin Burchell2012-03-212-1/+41
| | | | | | | | | | | | | | | This causes all sorts of problems, but is also blocking the introduction of new, more detailed signals, because the backend never correctly identified the removal. The object handle appears to be woken up before the directory is actually deleted, thus causing QFileInfo::exists() to return true, and not doing the removal dance. This behaviour isn't exactly documented (as far as I was able to find out), but also seems to happen consistently, and Chromium also contains a comment noting a similar issue. Task-number: QTBUG-2331 Change-Id: Icfb6219b78e688852d7863a666a0ffc31bb4d573 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Cocoa: improve mouse button tracking warningsBradley T. Hughes2012-03-211-5/+5
| | | | | | | | | | The warnings about "Internal mouse button tracking invalid" should check for the correct button before emitting a warning. The warning should also mention the correct button as well. For otherMouseDragged, we simply check for any button that's not the left or right button. Change-Id: I9eb6d6bd7fb5919e745b7f8eb517b4bc9efd36a6 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Cocoa: Improve window activation handling.Morten Johan Sorvig2012-03-213-5/+15
| | | | | | | | | Make Qt window activation follow the Cocoa key window, with one exception: Popup windows become the key window but not the Qt active window. Change-Id: Ic4d8685737fa3ec5c15a68b81844929370c9cd8e Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* QDoc: Changing "element" string to "type".Jerome Pasion2012-03-211-1/+1
| | | | | | | | -QDoc output should use "type", not "element". "This type was introduced..." Change-Id: I72b6ba6318889d7727796b80574b72694f2b7594 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* permit explicitly empty qt.conf entriesOswald Buddenhagen2012-03-211-4/+4
| | | | | | | | | | | | | | this allows expressing "no SettingsPath" cleanly, and makes the internals cleaner. this is marginally behavior-incompatible in that if somebody had Prefix or Data set to an empty string (rather than a dot, which is hinted at by the documentation and commanded by common sense), he would have gotten the binary's directory resp. Prefix, while now it will be just empty. Change-Id: I3c11cc4e8671ffb604d4889389764a9ba9c2e7e6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Remove hardcoded font names in QFont::defaultFamily()Jiang Jiang2012-03-212-17/+17
| | | | | | | | | | | QFont::defaultFamily() should not use any hardcoded font names like "Helvetica" or "Times" as they might not be present in certain systems, it should rather use abstract names like "sans-serif", "serif" and "monospace" then let the platform plugin to decide which font map to them. Change-Id: I5aafb103a5238c17b10773711ad504806c6fc3ce Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Cocoa: Implement screen availableGeometry.Morten Johan Sorvig2012-03-212-2/+8
| | | | | | | | As usual the y coordinate needs to be inverted. Change-Id: Iac9b48f9bdb475a3d5a76b930c2e138a625f1ef8 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Cocoa: fix inactive palette text colorBradley T. Hughes2012-03-211-9/+10
| | | | | | | | | The QPalette::Inactive text color should be the same as kThemeTextColorDialogActive. kThemeTextColorDialogInactive is for disabled widgets/windows. Change-Id: I55eb63fff213cb9870a991455cbc3254b9d1538e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Cocoa: fix crash when using QPrintDialogBradley T. Hughes2012-03-211-2/+2
| | | | | | | | The contextInfo passed to printPanelDidEnd should be a QPrintDialog*, not a QPrintDialogPrivate*. Change-Id: I8f9aae2f27b483b4669f9d39cdafd0ddeb37fd22 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* EGLFS: Integrate building into configure.Donald Carr2012-03-2113-91/+76
| | | | | | | | | | With the move to the QPA architecture EGL is now only required by individual platform plugins and the configure script has been adjusted to reflect this. Change-Id: Ieadacef0b970f29752d9e3e36a007e5cbb005b0d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Avoid Qt/X11 header contamination via egl.hDonald Carr2012-03-201-0/+3
| | | | | | | | | egl.h on certain platforms directly includes X11 headers, resulting in an all too familiar header conflict. There are existing defines we merely need to set in order to avoid this eventuality. Change-Id: Ic91b66286ad6cc329f9c88b5e47834690a8eb96a Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add egl include paths and link lines to eglfs.Girish Ramakrishnan2012-03-201-1/+1
| | | | | | | | This is the equivalent of 821fc4cf4e520a74b8d4c834f2fb46e4e2f27001 from qt4 but done differently because qt5 has egl.prf. Change-Id: I52114239bdeda6c300db04a7859cae52aa9e9b41 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix a typo in QFontconfigDatabaseJiang Jiang2012-03-201-2/+1
| | | | | | | | Font family names for default families (Serif, Sans serif, Monospace) was only taken from the first family in the array (aka. always Serif). Change-Id: Ia326dc85e03819f1a72deda66aade348809d94da Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix GPOS positioning for some fontsEskil Abrahamsen Blomfeldt2012-03-201-4/+5
| | | | | | | | | | | | We need to do ACCESS_Frame for each 2 byte frame, otherwise the position of the cursor in the input stream will not be updated by enough, and we will read twice as many pairsets. Depending on the value read for the SecondGlyph in the broken pairsets, we might get strange kerning results. Change-Id: I7fb5a850afe0364b3dd50869d5f36fd14d2f4eaf Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Adrian Yanes <ext-adrian.yanes@nokia.com>
* Set the default QPA plugin for QNX builds to "qnx"Sean Harmer2012-03-201-0/+2
| | | | | | Change-Id: I630c3631d480929c1e3a618d0f0b084fd2cc6ad0 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix stltest compilationGiuseppe D'Angelo2012-03-201-0/+1
| | | | | | | | | | The usage of std:ptrdiff_t in the test requires the #inclusion of the cstddef header. Task-number: QTBUG-24828 Change-Id: I7e1ca6ee010469708f8da1709563b5ebced972e5 Reviewed-by: Anssi Eteläniemi Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove old bic test dataMarius Storm-Olsen2012-03-20159-833539/+0
| | | | | | | | We will not be testing BIC of Qt5 against Qt4 Change-Id: I6f0eea3dd60eea1535749240a178a19605c981d0 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert "Remove the LIBS from platformsupport"Samuel Rødal2012-03-202-0/+2
| | | | | | | | | | | | This reverts commit cd6e90c70ac13065257422088ffa01537ed9c685. Prevent symbol lookup error when requesting alpha visuals with GLX in the xcb plugin. This means other plugins will also link against -lXrender, but we need this workaround for now. Change-Id: I2fd2c63bc577c2497060a555c91d72337723b931 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 18:54:45 +0000