summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Again to fix compilation after b0afad8f0b6a3be7ab3a23e063b0201cd68ada95Thiago Macieira2014-04-251-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 125bb81bef7729d182f533989ffdf53685abbe31 wasn't enough. Let's just make it simpler and use a regular function. Change-Id: I9627dedaa87873b4b138224afd182e4fd9a55265 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| | * | Autotest: fix use of dangling pointerThiago Macieira2014-04-241-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "data" pointer became technically dangling after line 1866 did copy = data; as copy was the last reference to the original data. That made the pointer address available to be reused by the system malloc(), which sometimes happened, causing the unit test to fail. Discussed-on: http://lists.qt-project.org/pipermail/development/2014-April/016588.html Change-Id: Ifa6a27bd53a6e60392b77a6609f2d47148695211 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | / Updated corelib's unit tests to use QSignalSpy's functor constructorKeith Gardner2014-05-0819-337/+341
|/ / | | | | | | | | | | | | | | | | The intent is to provide compile time validation of signals and to help detect signal overloading in the future. Change-Id: I9d5d46ed4b70c5d0cd407deb5928b1e76d37e007 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Include the duplicated attribute name in the error messageThiago Macieira2014-05-066-6/+6
| | | | | | | | | | | | Task-number: QTBUG-36467 Change-Id: Ic2610bd7c8df12fce4ec2ce14bd96f4595bd38af Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | Add QUrl::fromUserInput overload with a cwd argument.David Faure2014-05-061-0/+48
| | | | | | | | | | | | | | | | Useful for any application that can take URLs on the command-line, so that full paths and relative paths can also be accepted. Change-Id: I8a2c50f36d60bdc49c065b3065972fd5d45fa12a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QRegularExpression: add ways to force an immediate optimizationGiuseppe D'Angelo2014-05-065-2/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fact that we kick in a pattern study and possibly a JIT compilation after an undocumented number of usages is suboptimal, for a number or reasons: users may want to JIT compile a pattern immediately, and at the same time they may not want a random delay in the program (due to the pattern getting optimized at a random usage). So: add an optimize() call to force an immediate pattern optimization, and a pattern option to force an optimization on the first usage. Change-Id: I95efdecfd31f11ca7cceb9c05037df613601a11c Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add locations AppDataLocation, AppLocalDataLocation to QStandardPaths.Friedemann Kleint2014-04-291-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows, DataLocation currently returns the value obtained by passing CSIDL_COMMON_APPDATA to SHGetSpecialFolderPath(). This is the local non-roaming path. For actually storing settings, the roaming path should be used (CSIDL_APPDATA). Introduce new AppDataLocation to return that path and AppLocalDataLocation for the local path and deprecate DataLocation. [ChangeLog][QtCore][QStandardPaths] QStandardPaths now has new enumeration values AppDataLocation, AppLocalDataLocation to be able to differentiate between roaming and local paths on the Windows operating system. DataLocation is deprecated in favor of AppDataLocation. Task-number: QTBUG-38483 Change-Id: Ib1de8c7031a863ed5eac10c747de6f7ff1a090c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: David Faure <david.faure@kdab.com>
* | Build fix for auto-registration of Container<void*>Jędrzej Nowacki2014-04-231-0/+8
| | | | | | | | | | | | | | | | IteratorOwner pointer specialization was failing for void* because of an invalid function overload. Change-Id: I80355ddd2b871c1fa2fa5bf5a4ed8bc7768fc3c9 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Add a more reliable replacement for qt_add/removeObject().Volker Krause2014-04-153-1/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These hooks only worked reliably with LD_PRELOAD on Linux/GCC, on other platforms they depended on what exactly the compiler optimizer is doing as well as some nasty assembler rewriting to actually access them. The new system uses a simple array of function pointers that can be set to custom hooks by tools that need this (based on ideas from Andre Poenitz). This also covers qt_startup_hook (similar problem), and the Qt version number that Andre had asked for. Change-Id: I2c3e7950fd49b1b1d04176be34c2fff3293981b0 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Marc Mutz2014-04-117-3/+108
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-117-3/+108
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-armv7le-qcc/qplatformdefs.h src/printsupport/kernel/qcups.cpp src/widgets/styles/qstyle.h tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp Change-Id: Ia41e13051169a6d4a8a1267548e7d47b859bb267
| | * Fix capacity reservation for shared QByteArrayThiago Macieira2014-04-054-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can squeeze, but not by discarding elements. Make sure the size of the object stays intact after changing the reserved capacity. I've also added unit tests for other containers, just to be sure. Task-number: QTBUG-37750 Change-Id: I5135b095943b7589423c51cebcb52af792468e61 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
| | * Don't read before the beginning of the stringThiago Macieira2014-04-041-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code did discard the the data, so it wasn't affecting the comparison result (tests added anyway), but it could cause crashes if the pointer to the beginning of the data in the first 8 bytes of a page. Change-Id: I618e68de329b65de34ef8c934934c3e631cc6c9f Reported-By: Erik Verbruggen Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
| | * Logging: Be also more strict with value of logging ruleKai Koehne2014-04-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only accept lower-case "true" and "false", as documented. The old check didn't match either the documentation, nor the QSettings/ QVariant behavior (where, for a boolean value, any lower-cased content that not empty, "0" or "false" is considered true). Change-Id: I317d29c16a27f862001b9dff02e8298df8acf5a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Re-add missing test to kernel.proJędrzej Nowacki2014-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Patch 9a08483d763dacfca6029f7a8970846e83df0e2a introduced a regression, tst_qmetatype test was not meant to be removed. Change-Id: I5456ffbbd9d9f8e461f828c6183e46dabf67952b Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | QStringList: add op= overloads for QList<QString>Marc Mutz2014-04-111-0/+16
|/ / | | | | | | | | | | | | | | | | | | | | QStringList = QList<QString> already compiled, but was interpreted as QStringList = QStringList(QList<QString>), which involves the QList copy ctor. Adding the overload saves that copy. Cannot use a using declaration here, since the return type is different. Change-Id: I9f4feb2f97480d2d6a3b6fa7c71b5d511b623601 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QWeakPointer: add member-swapMarc Mutz2014-04-031-0/+24
| | | | | | | | | | | | | | | | [ChangeLog][QtCore][QWeakPointer] Added member-swap function. Change-Id: Ide3672dc74a9d8153e5f930290d938e8c23993b5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QWeakPointer: add lock() for std::weak_ptr compatibilityMarc Mutz2014-04-031-0/+18
| | | | | | | | | | | | | | [ChangeLog][QtCore][QWeakPointer] Added lock() method for std::weak_ptr compatibility. Change-Id: I0851d91c51f5a4f04a855a1d8082234ce38396b4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/stable' into devIikka Eklund2014-04-016-55/+133
|\| | | | | | | Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069
| * OS X QSettings auto test/writing check updateSamuel Gaist2014-03-311-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch aims to provide an updated test that follows changes started in 10.7: new rule is that only root can access SystemScope settings. It also disables the sync() workaround code path which is at least not executed during the tst_QSettings execution and returns wrong value to the test. From Apple's documentation: "Note that modification of some preferences domains (those not belonging to the “Current User”) requires root privileges (or Admin privileges prior to OS X v10.6)—see Authorization Services Programming Guide for information on how to gain suitable privileges" https://developer.apple.com/library/mac/documentation/CoreFoundation/Reference/CFPreferencesUtils/Reference/reference.html [ChangeLog][QtCore][QSettings] QSettings now returns the correct value for isWritable() when using SystemScope settings. Task-number: QTBUG-9824 Task-number: QTBUG-21062 Task-number: QTBUG-22745 Change-Id: Ib6a1490ec596b99d189ec4de9a0f28ecfd684172 Reviewed-by: Liang Qi <liang.qi@digia.com>
| * Mac: make FSEvents-based QFileSystemWatcherEngine more robust.Erik Verbruggen2014-03-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Record the last event ID with every callback. This event ID is passed to FSEventStreamCreate when restarting the stream, so the watcher will receive all events that occurred since invalidating the previous stream. - Never start with kFSEventStreamEventIdSinceNow, because this will generate a (bogus) soft-assert in FSEventStreamFlushSync in CarbonCore when no event occurred since stream creation. The last globally generated event ID is used instead to simulate the "now". - Do not dispose and recreate the stream in the callback, but use a queued signal-slot connection to schedule this on thread that owns the watcher. Change-Id: I02f5a845d9e27f9853ed97925ab9c7a5bc0dede1 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| * Check for administrative rights in tst_qsettings.Friedemann Kleint2014-03-271-41/+97
| | | | | | | | | | | | | | | | | | | | Introduce function checking whether the system settings in native format can be written to. If not, default to user scope or skip the respective tests instead of failing. Task-number: QTBUG-37822 Change-Id: I330aff9b79bb22254216f022af807e010bc8e8ba Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| * Stabilize tst_QProcess::softExitInSlots()Sergio Ahumada2014-03-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This test takes more than 5000ms to finish some times, so waiting for 10000ms should be enough to make it more stable on all platforms. ../tst_qprocess.cpp:1072 :: [gui app] QTestLib: This test case check ("proc.waitedForFinished") failed because the requested timeout (5000 ms) was too short, 6150 ms would have been sufficient this time. Change-Id: I266ad0e65bf3c84e73b7ca6543dc15335dad4c99 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * Mark some tests as XFAIL on QNXSergio Ahumada2014-03-272-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extending this to stock QNX as well since it is not BlackBerry 10 specific. - tst_QNumeric::floatDistance() - tst_QNumeric::floatDistance_double() - tst_QtJson::testNumbers_2() - tst_QtJson::toJsonLargeNumericValues() - tst_QtJson::parseNumbers() Task-number: QTBUG-37066 Change-Id: If0e5d4fbefac5e8a0efed8ef8b1b7655ff6e7766 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| * Reuse one QCollator instance for QString::localeAwareCompareLars Knoll2014-03-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Constructing a QCollator is somewhat expensive, and made localeAwareCompare really slow. As QCollator (at least with the ICU implementation) is not thread safe, use one collator per thread. This speeds up collation of a long list of strings by a factor of 250 for the test case in the bug below. Task-number: QTBUG-36149 Change-Id: I645cdc3546347d1dcc7a03b7563b628c7f756944 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | tst_QStringList: add more checks for removeDuplicatesMarc Mutz2014-03-311-2/+7
| | | | | | | | | | | | | | | | Check whether a detach happened, and also check that non-consecutive duplicates are properly removed. Change-Id: Iac7a3d8fe5ed5a69a9a0b55ddbf95308f11122c2 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | QStringList: add op<< overload for QList<QString>Marc Mutz2014-03-311-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | QStringList << QList<QString> already compiled, but was interpreted as QStringList << QStringList(QList<QString>), which involves the QList copy ctor. Adding the overload saves that copy. Cannot use a using declaration here, since the return type is different. Change-Id: I119cc98e7e2df24549a1abb158543b729edc30ef Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Properly serialize QFont.Mitch Curtis2014-03-311-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some data was never serialized (styleName, hintingPreference) and some was incorrectly serialized (styleStrategy). This change also adds auto tests for every applicable QDataStream version. [ChangeLog][QtGui][QFont] QFont now serializes its data properly, without any data loss. Task-number: QTBUG-22814 Task-number: QTBUG-22946 Change-Id: I34e61b10662b7ad6c57054dacc7e1f522f5b5c5d Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Mitch Curtis2014-03-318-20/+29
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-248-20/+29
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/gui/image/qjpeghandler.cpp Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
| | * Logging: Remove PatternFlag::Invalid from QLoggingRuleKai Koehne2014-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flag is not orthogonal to the rest, and e.g. checking with flags & Invalid will fail. Rather make it explicit by comparing with 0. Change-Id: I428d5e71f5ecd05f61d543aaa78532548ef93d5a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Print when logging rule is invalid.Kai Koehne2014-03-201-0/+10
| | | | | | | | | | | | | | | | | | | | | Print a warning when an invalid logging rule is parsed. Change-Id: I3bf9a6df4053d36b3803652b2faa86168d5222bc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Fix Q_DECLARE_METATYPE macroJędrzej Nowacki2014-03-171-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The macro should stringify value of the given token not the token itself. Task-number: QTBUG-37547 Change-Id: I90f4fa613bd13d5a581828ab13f620b40dfd3593 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| | * Introduce GENERATED_TESTDATA variable and fix qresourceengine test.Janne Anttila2014-03-141-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testcase.prf cannot be loaded from pro file for various reasons, see qtbase commit history for details. Moved runtime testdata logic from pro file to testdata.prf, and thus made is reusable in other test cases as well. Change-Id: I500d08dc4951e4eda862071e4ddd3e0f6de8c3d2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Fix tst_qthreadpool under high load.David Faure2014-03-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tasks might not have run yet at the time of the QCOMPARE, so we need to acquire on the semaphore in order to ensure that this is the case, just like in the previous testcase. Change-Id: I1da72bb07c2f53760b3bf912fc26aaf10ed18d48 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| | * Fix qchar testdata installation.Janne Anttila2014-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NormalizationTest.txt does not exist in the project root, but under 'data' directory. TESTDATA is converted to INSTALLS rules in testcase.prf. INSTALLS rules generated in testcase.prf does not set 'no_check_exist' CONFIG variable. Thus qmake will not install NormalizationTest.txt since it cannot find it from defined location. Even TESTDATA has been incorrectly defined, NormalizationTest.txt has been found in majority of the platforms thanks to QFINDTESTDATA flexibility. However it causes problems on sand-boxed platforms such as WinRT. Fixed by defining the relative path to NormalizationTest.txt in TESTDATA so that qmake can find the file when processing INSTALLS variable. Change-Id: Id9a28db2a00b17d2c0136e6ff32f421b21137898 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
| | * Disable UNC tests on WinRT.Janne Anttila2014-03-142-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Based on file system implementation for WinRT, the UNC paths are not supported on WinRT, so lets disable corresponding tests as well. Change-Id: Ib45ae618f39d5da39a822160096599b30204cf71 Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| | * Removed unnecessary TESTDATA statement from qmessageauthenticationcode.Janne Anttila2014-03-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMessageAuthenticationCode autotest does not have data folder for TESTDATA. It seems that pro file is copy/pasted from another one which actually have data. Removed the unnecessary statement since it caused problems for https://codereview.qt-project.org/77981. Change-Id: Ide753e5692bd2f469217760173a9b60f2f646770 Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Liang Qi <liang.qi@digia.com>
* | | QVector: add removeOne(), removeAll() for QList compatibilityMarc Mutz2014-03-261-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eases migration from QList to QVector. [ChangeLog][QtCore][QVector] Added removeOne(), removeAll() for QList compatibility. Change-Id: I4211afb2e077c187d0a39f0ac4528f0c66721fb3 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | | QVector: add more insert() testsMarc Mutz2014-03-261-17/+75
|/ / | | | | | | | | | | | | | | Add more insert() tests, since the existing ones only covered the index-based insert() variant and only movable types. Change-Id: Ifce7a67be0bef45f926f13521873a1d77430e1e3 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | tst_QSharedPointer: add more tests for forward-declared payloadsMarc Mutz2014-03-141-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | It is not sufficient that QSharedPointer<ForwardDeclared>'s default ctor and dtor compile. Copy/move assignment/construction and swapping should work, too. Arguably, there are more functions that should compile with just a forward-declared payload, but this is a start. Change-Id: I75470e3d4ba949c3e735c4078cbc123d53ec3007 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add QDebug operator for QMimeType.David Faure2014-03-131-0/+2
| | | | | | | | | | | | Task-number: QTBUG-35686 Change-Id: I72be7cf9374f86e8cb3e6946129bbfec8fec9616 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | QDebugStateSaver: call maybeSpace() in destructor.David Faure2014-03-131-3/+11
|/ | | | | | | | | | | tst_qdebug didn't test adding something else after the MyLine object, so I didn't realize that a space was missing there. All debug operators should end with maybeSpace(), but with the settings of the caller, so this requires restoring the settings before calling it. To make it convenient for all << operators, the destructor of QDebugStateSaver takes care of that. Change-Id: I18ab78d99d7ee3be951082b5b5d34718ee60e21d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Logging: Let user configure rules via QT_LOGGING_RULESKai Koehne2014-03-131-0/+8
| | | | | | | | | | | | Check also for rules set in an environment variable QT_LOGGING_RULES. This makes it even more convenient to set rules e.g. for just one run of an application, without having to create a logging configuration file. It is also more in place with the current way we enable/disable debugging of parts of Qt via environment variables. Change-Id: I4d05976f2b6c12bca472552ffa22345475cd01de Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Tomasz Olszak <olszak.tomasz@gmail.com>
* Use QStringRef for parsing of logging rulesKai Koehne2014-03-131-1/+1
| | | | | | | | Use QStringRef to speed up the parsing of the left side of logging rules. Change-Id: Idd4d75496e3865d092f2802c45928a414c14c615 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make parsing of categories in logging rules more strictKai Koehne2014-03-131-0/+8
| | | | | | | Do not accept rules with wildcards in the middle. Change-Id: If6fa71629c46bc4127aa8bd475643bc0e8a9f57c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make parsing of categories in logging rules consistent.Kai Koehne2014-03-131-0/+114
| | | | | | | | | | | | | | | | | | | | | | | The documentation says that the left side of a logging rule has the syntax <category>[.<type>] with optional wildcard '*' as the first or the last character (or at both positions. However, so far we didn't allow qt.*.debug But what we did allow is implicit dropping of trailing '.', e.g. qt.* matched also 'qt' Fix these by splitting up the '.type' in advance, and then do string matching only on the 'real' category names. Change-Id: Iab50ad0fc673464e870f5ab8dfb3245d829b3107 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QDebug: Allow text stream formatting for 64 bit numbersKai Koehne2014-03-131-0/+13
| | | | | | | | | | | | | | | Use the QTextStream stream operator for formatting 64 bit numbers, just like we do for other numbers, too. This ensures all numbers in a QDebug stream e.g. respect the hex and showbase modifiers. The original reason for formatting qin64, quint64 with QString::number is unclear (pre-dates the original qt4 git import). Maybe QTextStream did lack proper support for 64 bit numbers back then. Task-number: QTBUG-36841 Change-Id: I049516c2a8394c9c1a708f86c3d950418a20a957 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Revert the QByteArrayList addition to Qt 5.3Thiago Macieira2014-03-083-228/+0
| | | | | | | | | | | | | | | | This reverts commits f12b0f9a38c792abb13f3e6ecff4542986a6f96b ("QByteArrayList: optimize op+"), f96f2fe3670bc8a32389795dc21b9839407465a1 ("Enable QByteArrayList tests"), and 4f23f0530a9c59400a7f3821cd2c9355801ed8cd ("new QByteArrayList class"). This class is coming back in Qt 5.4. [ChangeLog][CHANGELOG FIX] Remove the line about QByteArrayList being added. Change-Id: I890ab2b34a9b3e575512eb306d0f241143a867cf Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Add Objective-C specific type converters to QByteArraySamuel Gaist2014-03-083-0/+131
| | | | | | | | | | | | | | This patch adds the Objective-C NSData/CDataRef converters to QByteArray This will replace the current converters offered in QMacExtras [ChangeLog][QtCore][Objective-C] Added NSData/CDataRef converters for QByteArray Change-Id: I7a0f14bee4271798db345f3c5efd26ac671a3ea4 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>