summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make QLocale not depend on being friends with the global staticThiago Macieira2012-03-222-9/+8
| | | | | | | | Don't assume that the global static is a function. Instead, create a class that is friends. Change-Id: I992f4d819b367899b19d95b4983e6b243f0ed932 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove the workaround for GCC 3.3 on IRIXThiago Macieira2012-03-221-12/+0
| | | | | | | GCC 3.3 is no longer supported. IRIX is no longer supported. Change-Id: I1656a6fdcf2b244f0f6c812e71b0e793d37fb98b Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Make architecture detection more robust.Girish Ramakrishnan2012-03-224-43/+21
| | | | | | | | | Any message/error in mkspecs or qmake feature files ends up confusing the current arch detection logic. Instead, search for "Project MESSAGE: .* Architecture: <arch>". Change-Id: I308932a5b75f3a1fcbc4fe30c74faf2e83b2d752 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fix compilation on ARM with C++11: narrowing conversionThiago Macieira2012-03-223-3/+3
| | | | | | | Cannot have double-to-float conversions inside { } in C++11. Change-Id: I13c27307efd703420b6667d919bb42c2ee82e6cc Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix the build of qt-freetype with -system-zlibThiago Macieira2012-03-221-0/+1
| | | | | | | | | | | | | The static library needs to link to zlib too, so that the plugins using this library link to zlib. At runtime this doesn't make a difference because -system-zlib means QtCore is linked to zlib and the system zlib shared library was loaded, so the symbols are resolved. However, since -Wl,-no-undefined was added to the build, the plugin must link to zlib explicitly too. Change-Id: I10d6df8814e823079fee76ae6a7d5b55057c9daf Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix the build of -qt-freetypeThiago Macieira2012-03-222-1/+1
| | | | | | | | | | | The symbol must be exported from QtGui for the plugins to be able to see it. Also, fix the build in namespaced case: cannot use extern in QtPlatformSupport because it's not compiled into the Qt namespace. Change-Id: I029533f3524e3cbf6c87aed79c1f2e7b55aebb9b Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix compilation: std::min is in <algorithm>Thiago Macieira2012-03-221-0/+1
| | | | | Change-Id: I89227bb9fca0f081a232c2ede10c4d455edb2ee9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Save the pkg-config settings in config.statusThiago Macieira2012-03-221-0/+4
| | | | | Change-Id: I6fc14eaf071ff56325bbcabb0ae8971fcf07b370 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add a non-implicit virtual destructor for QDashStrokerThiago Macieira2012-03-222-0/+5
| | | | | | | | | The base class has a virtual destructor, so the destructor is already virtual. Make it non-implicit so that the virtual table and other virtual inline methods don't get emitted everywhere. Change-Id: I15296c1114086ff0b1da701ccd51525bec99d76b Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Add qpair.h to the HEADERS listThiago Macieira2012-03-221-0/+1
| | | | | Change-Id: I81d078a80b2fba201da9440e3550c2b73adaf668 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Remove the false information that IA-64 supports SSE2Thiago Macieira2012-03-221-6/+0
| | | | | | | | | This must have been a mistake. IA-64 processors used to contain an IA-32 core, which supported SSE2. However, the IA-64 mode supported no such thing. Change-Id: I731c6018166af6b897cb697c68aad4ef3ae93132 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* support relative Sysroot specification in qt.confOswald Buddenhagen2012-03-221-5/+3
| | | | | | | | | permits relocatable qmake installations in, say, $sysroot/hosttools/. note that it makes patently no sense to have a relative Prefix when using a relative Sysroot. Change-Id: I36e5149acb20a885c3cd244bc9d67aa48b01a56f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make unspecified/empty HostPrefix fall back to PrefixOswald Buddenhagen2012-03-221-0/+6
| | | | | | | | this is needed for backwards-compatibility, and generally makes sense. Task-number: QTBUG-24839 Change-Id: I42b008a9dfb43cc2ebe49c8baa2c29f5d6a75897 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* More UTF8 fix of raster autotestaavit2012-03-221-2/+1
| | | | | | | This completes 6c98fd2, for systems where default codec is not UTF8. Change-Id: I94795785d5d172558c40c06bd3ef4ffaba1624c5 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Fixed QScreen::name() return value on xcb.Samuel Rødal2012-03-221-1/+5
| | | | | | | | Previously the primary sceen number wasn't stripped before adding the actual screen number, resulting in names such as ":0.0.0". Change-Id: Ifbcf12dcf1c200fd6bc5e4b95a5d82483957e0d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix assert in libdbus-1 from tst_qdbusmarshall.David Faure2012-03-221-6/+10
| | | | | | | | | | | | Serializing an empty object path was crashing with > arguments to dbus_message_iter_append_basic() were incorrect, > assertion "_dbus_check_is_valid_path (*string_p)" failed in file > dbus-message.c line 2555. Thiago says this depends on the libdbus build settings, which is why it didn't happen to everyone. OpenSUSE-12.1 here. Change-Id: I657d28d5d915706a22abfd273aad88d20e2d112a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add configure bootstrap generated files to .gitignoreShane Kearns2012-03-221-0/+4
| | | | | Change-Id: Ic538f46eabdf3de96d79c6e2f56627e47933bbab Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Allow autobound UDP sockets to send to IPv4 and IPv6Shane Kearns2012-03-224-3/+86
| | | | | | | | | | | | | | | | When writeDatagram is called without first binding the UDP socket, then bind it as QHostAddress::Any. This allows the same socket to be used to sent to both IPv4 and IPv6 destination addresses. Allowing the OS to autobind the socket inside sendTo() may result in a single protocol socket. Task-number: QTBUG-5275 Change-Id: I2b76507e8a8a38369c6eafb61ce4191d1d6cc930 Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Martin Petersson <Martin.Petersson@nokia.com>
* MIPS DSP configure detection and initial blend optimizations.Damir Tatalovic2012-03-229-1/+970
| | | | | | | | | | | | | | | | | | | | Adds new MIPS configure test and -no-mips_dsp and -no-mips_dspr2 configure options. List of optimized implementations: - comp_func_SourceOver - comp_func_Source - qt_memfill32 - qt_destFetchARGB32 - qt_destStoreARGB32 - blend [RGB32][RGB32] - blend [ARGB32_Pre][RGB32] - blend [RGB32][ARGB32_Pre] - blend [ARGB32_Pre][ARGB32_Pre] Change-Id: I35411858295b7b3f4895eb56e3b93397528903cc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QStandardPaths: implement displayName() on all platforms.David Faure2012-03-224-18/+42
| | | | | | | | It was only implemented on Mac OSX until now (all this came from the QDesktopServices code). Change-Id: I7fd81d80ca77cf0ca6c213f59813a6163abe7dc5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Significantly speed up insertion into QJsonObject/ArrayLars Knoll2012-03-223-10/+47
| | | | | | | | | | | | The code was only allocating memory for the next insertion leading to a reallocation of the whole data for every single insertion. The code now reserves some space and uses a decent growth strategy to avoid repeated reallocs. Change-Id: I48b0feab71ba8ca73e7037f8460080f198b2f009 Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
* 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>