summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* QDoc: Pretend that .qtx and .qtt files are .qdoc files.Casper van Donderen2012-04-271-1/+1
| | | | | | Change-Id: I2b530e526d2c1f5102960dab4991ceade414f1eb Reviewed-by: Ed Baak <ed.baak@nokia.com> Reviewed-by: Peter Yard <peter.yard@nokia.com>
* fix build with mingwKonstantin Ritt2012-04-271-17/+17
| | | | | | | since MinGW is GCC, invert the order and place the GCC constructs first Change-Id: I98113aa77e51f9e01c3641987e915bf475053a60 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fixed iOS compilation issues.Ian Dean2012-04-261-2/+2
| | | | | | | | Put MacOS-specific code in #ifdef blocks so that it is not compiled for iOS. Change-Id: I303b7dbb63eb298e92351951731868df6a38bffa Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Revert "Harfbuzz-shaper - fix incorrect logClusters being set in ↵Eskil Abrahamsen Blomfeldt2012-04-261-35/+13
| | | | | | | | | | | | | | HB_OpenTypePosition" This reverts commit add629d4f16a536fc56d55727195e3247b621a54. The commit caused crashes when laying out some text (e.g. ordinary Arabic text) with certain fonts (it triggered the assert in QTextLayout::addNextCluster()). The regressions will have to be weeded out before the fix can be recommitted. Change-Id: Iee457f138367d4cf8fcbd2e518271d8eaa95a62c Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Uncomment qnetworkproxyfactory autotestShane Kearns2012-04-261-1/+1
| | | | | | | | | It no longer requires hardcoded configuration, and it passes on linux, mac 10.6 and windows desktops Change-Id: Ibaa63520dade58ce13c23cf2aba3ddbc5be1c472 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fix memory leaks in 64-bits ODBC driverHonglei Zhang2012-04-261-2/+4
| | | | | | | | | | | | | | On 64-bits Windows system, integers and longs are still 4 bytes values. Several functions that were previously defined with SQLINTEGER and SQLUINTEGER parameters have been changed where appropiate to use new SQLLEN and SQLULEN typedefs. SQLGetStmtAttr() is one of these functions. This fix replaces SQLINTEGER with SQLULEN in appropriate functions to avoid memory leaks. Task-number: QTBUG-25256 Change-Id: I744927f42b8578ece60815df360e3b337ebf452a Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* get rid of Q_*_EXPORT_INLINE macrosKonstantin Ritt2012-04-265-89/+37
| | | | | | | | | | | | > Girish: > We should be able to remove the macro completely today, > just mark all those functions as plain inline. > With Qt5, we don't have to worry about bc yet. this fixes "import attribute ignored" warnings on mingw with -fno-keep-inline-dllexport Change-Id: I616e5de7c8d59953ce03a316b941a439fae56298 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix C++11 compilationOlivier Goffart2012-04-261-6/+6
| | | | | | | | Fix compilation with compilers that support user defined literal (such as GCC 4.7) Change-Id: I31cd3d2177688f963ab33cf68cd6060a5fb8640f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Create interface for navigator calls and implement for BPS and PPSKevin Krammer2012-04-2611-100/+665
| | | | | | | | | | | | Makes QQnxServices available on non-BPS systems by delegating to an interface which is implemented on systems with BPS using the currenly used navigator API and on systems without BPS by sending an appropriate message to the navigator's PPS service interface. Change-Id: I0e32fb11e6debb7b7b4693c0bc02af4f75ee2162 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Take account of spanned items in QTreeView when dragging.Stephen Kelly2012-04-262-32/+42
| | | | | | | | | | Also remove some code which has been unused since it was introduced in 32182d107fa75e5619ecc91a81f50626f429ebe1 Task-number: QTBUG-25140 Change-Id: Ic7053d68d8200f845c1ae330342d27af7275e057 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@digia.com> Reviewed-by: David Faure <faure@kde.org>
* Doc: Use the proper way to find qdoc.Casper van Donderen2012-04-262-2/+4
| | | | | | | | Previously $$QT.core.bins was used to find qdoc, the proper way is to use qtPrepareTool(). Change-Id: I5d97f5517ae63253ccaf1fb1487034c3a312a074 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Doc: Add "make docs" command for QtXml.Casper van Donderen2012-04-263-1/+4
| | | | | | | Also fix a typo in the qhp/index URL. Change-Id: I5774982b15f9de5b59966a2d932307b156eecc7f Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
* QDoc: Disambiguate prev and next links in html source.Casper van Donderen2012-04-261-2/+2
| | | | | Change-Id: Iaa82b9b6de71b577a44eae86eb6847c07d068670 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* Map QAccessible::Role to the proper IA2Role.Jan-Arve Saether2012-04-261-1/+10
| | | | | | | | All enum values after the MSAA-specific roles needs a special mapping. Change-Id: I6c77abf09b68d2d3d772937be986d532db2e5292 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Use non-blocking reads on virtual keyboard pps device.Sean Harmer2012-04-261-1/+6
| | | | | | Change-Id: Iad350c948049128f3014a6ad6536ac9dc2ee86d5 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
* Fix compilation when debug output enabled on virtual keyboardSean Harmer2012-04-261-1/+1
| | | | | | | Change-Id: I467e9ef624bcd10cb5b61f6f665a7bbb0bb1f57a Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
* Make QTimeLine test significant.Jason McDonald2012-04-261-1/+0
| | | | | | | | Known failures in this test are now handled by QEXPECT_FAIL. Task-number: QTBUG-24796 Change-Id: I12ba57370cf3df1a85a108fbbcdc9db2222491c1 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Ensure that QUrl::{to,from}LocalPath encode/decode properlyThiago Macieira2012-04-262-1/+37
| | | | | | | | | | | | | | | Unlike path(), toLocalFile() isn't reporting a URL component, so it should decode the percent-encoded characters fully. This extra decoding pass is meant to catch %00 to %1F, %7F and %25 (the percent sign itself). It also catches %80 to %FF, which aren't decoded because they don't form UTF-8 sequences. That means QUrl::toLocalFile() has undefined behaviour if the path contained non-UTF8 sequences. Task-number: QTBUG-25459 Change-Id: Iab5a0ba6afcfc4510e297984f2ffc208cedd752b Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Added mkspecs for iOS.Qt4iOS2012-04-2636-0/+1532
| | | | | | | | | | Modified common MacOS gcc config for iOS compatibility. Added iOS mkspecs for iOS devices and simulator using G++, LLVM-G++ or CLANG compilers. Change-Id: If0a0b1a3ce4e0dc4db319a315e227a9d31549399 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Remove deprecated conversion from QKeySequence to QStringOlivier Goffart2012-04-262-2/+2
| | | | | Change-Id: I3844913c16b9d6222f48e66dddc1d680458ffa56 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Fix QRawFont autotest in WindowsMiikka Heikkinen2012-04-252-3/+10
| | | | | | | | | | | | | Can't use style name with Windows native font engine, so do the comparison using style in case multipleRawFontsFromData(). Also XFAILed the advances() case when using Freetype font engine in Windows, as some of the advances returned are one pixel wider than expected. Task-number: QTBUG-24197 Change-Id: Ib5fecd83a93908e57a4c82ffb5495a92474ce45a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove QMetaObjectExtraData and put everything into QMetaObjectOlivier Goffart2012-04-2512-112/+46
| | | | | | | | | | | | | | | | QMetaObjectExtraData was added when support for QMetaObject::newInstance was added. One needed a place to put the pointer to static_metacall in the QMetaObject. But as we break binary compatibility, one can change the size of QMetaObject, and put everything back inside QMetaObject's own structure. Meaning it is not required anymore to have one QMetaObjectExtraData instance per QMetaObject anymore. Change-Id: If0b8f586cbaf633eed10045adee3ba3366826c86 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Split qobject_impl.h into qobjectdefs_impl.hKent Hansen2012-04-254-425/+488
| | | | | | | | | | | | | | | | | | | This is done to make QtPrivate::FunctionPointer available to the QMetaMethod declaration in qmetaobject.h (which already included qobjectdefs.h, since that's where QMetaObject is declared), so that the new template-based QMetaMethod::fromSignal() function may be implemented. The logic for statically generating the array of qMetaTypeId (used by the template-based QObject::connect()) remains in qobject_impl.h, since it's not needed for QMetaMethod::fromSignal(). Moreover, moving that code would introduce a circular dependency, since qmetatype.h as of commit 194674044693d6b101c3dc2f4784718540d343a4 now includes qobjectdefs.h. Change-Id: I36c35041e0c6661c3cf523684177a0b6c19e2d35 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Add comparison operators == and != for QMetaMethodKent Hansen2012-04-253-0/+62
| | | | | | | | | | | | | This is done in preparation of introducing the QObject::connectNotify(QMetaMethod) function. Together with the forthcoming QMetaMethod::fromSignal() function, which returns the QMetaMethod corresponding to a Qt/C++ signal (member function), the comparison operators provide an effective way of checking which signal was connected to. Change-Id: I2de48628c4884a7174fb8574895f272cb3fe5634 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Don't use the QRegExp methods that modify the object [QtWidgets]Thiago Macieira2012-04-251-1/+2
| | | | | | | | | | | | | | QRegExp matching methods modify the object, which we don't want to. In particular, when we receive a QRegExp from the user or we store in a context that might require thread-safety, make sure we make a copy before using it. QRegularExpression has no such shortcoming. Task-number: QTBUG-25064 Change-Id: I44cc44b75b3da10c5ece97cb6315c2c425327dc0 Reviewed-by: Alexis Menard <alexis.menard@openbossa.org> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* lance: Document all available command line options.Holger Hans Peter Freyther2012-04-251-2/+6
| | | | | Change-Id: I0e0d95cb5988574c1ecfbe7423ac7388022101fb Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* baselineserver: Fix compilation by removing PI_BuildKey from the sourceHolger Hans Peter Freyther2012-04-251-1/+0
| | | | | | | | | The buildkey support was removed in 7493ee1c44a16dc3. This commit removed PI_BuildKey and most of the usages from the code. Change-Id: I971d68cd4377c358381983c1edcb98360936b698 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Add makespecs for standard devices in the OMAP3 familyRomain Pokrzywka2012-04-254-0/+206
| | | | | | | | | | | | | | The beagleboard and Archos gen8 tablets are built on the same hardware and OpenEmbedded platform build system. The makespecs enable OpenGL/ES2 support and EGLFS as the default platform. Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Donald Carr <donald.carr@nokia.com> Change-Id: I04938676f82f9136efd662ff3ede16221eadf275 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* Fix recursion in qwidget gdiPainting test.Friedemann Kleint2012-04-251-4/+10
| | | | | Change-Id: If4881dfecc6fc7cebcd3ed896846d34e35b3e3ae Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add detection code for AVX2, HLE, RTM and AES to qsimd.cppThiago Macieira2012-04-252-17/+39
| | | | | | | | | | | | | | | AES is currently not enabled, since we don't use it for anything. The code is here with the proper detection should we want to in the future. RTM and HLE (Transactional Memory Extensions) I'll use soon in the locking code. Also rename a few variables to make it easier to read later on. Change-Id: I800c66d7e1ba86ec037692928d94f53ea5d5868f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Replace the x86 XGETBV instruction with its opcode bytesThiago Macieira2012-04-251-1/+1
| | | | | | | | | | | | | This is a new instruction, present on the SandyBridge architecture and later. Some older assemblers do not support it and produce: {standard input}:225:no such instruction: `xgetbv' The use of this instruction is protected by a CPUID check (function 1, ECX bit 27), so we only run it in processors that do support it. Change-Id: Ife7500c0deaab9539074835a4511e8c19602608e Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Update the x86 feature-detection code, unifying x86 and x86-64Thiago Macieira2012-04-251-125/+113
| | | | | | | | | | | | | | | Most of it is the same for both of them, so let's avoid doing everything twice. Or more, since we may support x32 soon. For Windows, use the intrinsics. For GCC, we'd like to use cpuid.h, but it only exists since GCC 4.3, so we can't. And properly detect AVX support: it's not enough to detect that the processor supports them, we also need to check that the OS enabled support for the 256-bit registers. Change-Id: Ibb4872cdb774de5701b18c40f4e612330a266214 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix atomics on SPARCThiago Macieira2012-04-251-8/+8
| | | | | | | | | Inspired by https://bugreports.qt-project.org/secure/attachment/26020/qt_atomic_sparc64.patch Task-number: QTBUG-22479 Change-Id: Ie3275df96c639d6a75e05f70fe5745aeb34457f9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Cocoa: support modal windowsBradley T. Hughes2012-04-254-32/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | Qt::WindowModal windows and dialogs are shown using [NSApp beginSheet:modalForWindow:modalDelegate:didEndSelector:contextInfo:] as long as they have a valid parent. Otherwise they are behave as application modal. Use the existing modal session support in the QCocoaEventDispatcher (which was inherited from Qt 4) to support Qt::ApplicationModal windows and dialogs. Some changes to this code are needed to ensure proper behavior: 1. Window level modification is now done in QCocoaWindow::recreateWindow() instead of in QCocoaEventDispatcher. 2. Make interrupt() use [NSApp abortModal] to stop a modal session (previously we were freeing memory from under Cocoa's feet, causing tools like valgrind and Instruments.app to complain) 3. Do not remove an item from a list and use a const reference to the removed item immediately after (minor bug fix). Also make sure that QCocoaEventDispatcher cleans up any modal sessions and retained user input events on destruction (otherwise we leave NSApplication in a weird state, which causes some autotest failures). Change-Id: Iaeefa025400f324b5348b8c81a40384ef026efb4 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Skip tst_QInputDialog on Mac OS XBradley T. Hughes2012-04-251-0/+2
| | | | | | | | | | | This test hangs in CI, but so far I've been unable to reproduce the problem. Disable the test for now so that this test does not block changes that bring in needed functionality. Task-number: QTBUG-25496 Change-Id: I81faa574b6d7bcab2e32becc2af0f71006c7dd9c Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Revert QUrl::isRelative to its Qt 4 behaviourThiago Macieira2012-04-252-5/+7
| | | | | | | | | Instead of trying to return whether the URL is relative to something undefined, let's instead follow what the documentation was saying all along and what the RFC says about "Relative References". Change-Id: I32722321a6b36c6e3480669ad769390e4c6f7d1c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Warn if we use deprecated methods from Qt modulesThiago Macieira2012-04-251-0/+1
| | | | | | | | | | | This change will cause any use of methods and classes declared with Q_DECL_DEPRECATED to produce a warning in the compilation output. Those warnings need to be silenced before the Qt 5.0 release, preferably before the beta. Change-Id: I28ce133867cc5918e177c57f6e5f7ab9421989ad Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Make configure.exe not overwrite its own Makefile in -fast modeThiago Macieira2012-04-251-0/+3
| | | | | | | | | configure.exe's Makefile is created by configure.bat. While severely lacking, it is what gets executed when the user configures, so developers modifying configure.exe should use that too. Change-Id: Ib216889594d08c980bfae6d2dbbb27ee9901375a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make configure.exe create files with Windows line-endingsThiago Macieira2012-04-251-3/+5
| | | | | | | | | Except for the perl sources, just in case. This helps if you need to open the output files in, say, notepad.exe. Change-Id: Ibf46b74af2efd6936586650e1405750bfef17952 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* MSAA bridge should not return any IA2-specific roles from get_accRole()Jan-Arve Saether2012-04-252-5/+8
| | | | | | | | Small cleanup/improvement. This patch just does what the removed ### says. Change-Id: I0d16541d2e4b8f948f32734ef0138fde5517932a Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Do not map LayeredPane and Terminal to the wrong MSAA roleJan-Arve Saether2012-04-251-3/+5
| | | | | | | | | | | | | | | | | | | | Microsoft did at some point extend the roles in MSAA with two extra roles (ROLE_SYSTEM_IPADDRESS and ROLE_SYSTEM_OUTLINEBUTTON). These are defined in oleacc.h as: #define ROLE_SYSTEM_IPADDRESS ( 0x3f ) #define ROLE_SYSTEM_OUTLINEBUTTON ( 0x40 ) This means that LayeredPane will map to ROLE_SYSTEM_IPADDRESS and Terminal will map to ROLE_SYSTEM_OUTLINEBUTTON, which is obviously wrong. We now reserve some valuespace for more roles to reduce the likelyness of any collisions in the future. Having the reserved area also serves as a way of indicating the boundary between the "MSAA" enums and other enums. Change-Id: Ic67a1a7200382fed3040e69b3e8856376ba642ac Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* get rid of QT_NO_IMAGE_TEXT switcherKonstantin Ritt2012-04-2510-60/+7
| | | | | Change-Id: Ie72f907ffb959f629af6a414959348a992c4c941 Reviewed-by: aavit <qt_aavit@ovi.com>
* QDoc: Implement -installdir CLI option for module cross-linking.Casper van Donderen2012-04-254-3/+22
| | | | | | | | | | | | QDoc needs to know the final location of the installed documentation to generate correct relative links between the modules. Normally you can use QLibraryInfo::DocumentationPath for this, but since QDoc gets compiled during Qt bootstrapping QLibraryInfo is not available yet. The -installdir option still allows us to specify QLibraryInfo::DocumentationPath on the command line. Change-Id: Ic4729f4daad112f0d175931467cf09cfcf5145a3 Reviewed-by: Martin Smith <martin.smith@nokia.com>
* Mark known test failures in Windows developer build.Jason McDonald2012-04-251-0/+3
| | | | | | | | | Previously, the CI system has not been testing on Windows with the -developer-build configure flag. Mark known failures for this configuration so that tests can be run in enforcing mode. Change-Id: I5fbbbe09a7b400d626107c66dcbd5c5469a45b20 Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Use macro for QByteArrayData initialization.Jędrzej Nowacki2012-04-251-4/+4
| | | | | Change-Id: Ib3f906dc5f313c7f9669efda26a93a76af7d7f80 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* support UTF-8 encoded file names in QZip*Konstantin Ritt2012-04-251-2/+9
| | | | | | Change-Id: Iba0457b55ef9fa3673f78b4d30d018a146e8fb1c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* Update QTest::QTouchEventSequence docsLaszlo Agocs2012-04-251-4/+74
| | | | | Change-Id: I2a8f88929f985b1543ec7c223266e8387f0a8a48 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* QHttpMultiPart: supply new line at the end of the bodyPeter Hartmann2012-04-251-2/+2
| | | | | | | | | ... to conform to RFC 2046 (section 5.1.1). Apparently IIS had problems without the new line. Task-number: QTBUG-25429 Change-Id: Ia619bbdcebd407b2716bc467323634e4c8d77bcd Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* optimize QChar::decomposition()Konstantin Ritt2012-04-251-27/+32
| | | | | | | | | | * by not using QString::fromUtf16() as we know for sure that the data is 'raw' UCS-2; * it's safe to avoid a check for > UNICODE_LAST_CODEPOINT as GET_DECOMPOSITION_INDEX macro already does a similar check Change-Id: Ifb660efc51c664d06733ac8ed46d54278520da06 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Using QLatin1String instead of QLatin1LiteralDebao Zhang2012-04-259-16/+11
| | | | | | | | QLatin1Literal is just a typedef of QLatin1String. Change-Id: If20ca225e57a7fb45a7775f0fc81aedb6da88c96 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>