summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* QFlags: Remove text promising 64 bit enums for 5.1Kai Koehne2013-04-281-1/+1
| | | | | Change-Id: I34173abd693cb124beb8feec5e0cee1f7842725e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* fix namespaced buildOswald Buddenhagen2013-04-251-2/+2
| | | | | Change-Id: I9d0a3cb08de5e91807da7f0358c83b6693ebd1ea Reviewed-by: hjk <hjk121@nokiamail.com>
* fix QProcessEnvironment documentation re case conversionOswald Buddenhagen2013-04-251-26/+11
| | | | | | Change-Id: I854382d1d431ee084ef0faa2e240e093b9183ec8 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove QLocalePrivate::m_localeIDhjk2013-04-232-36/+32
| | | | | | | | | | | | | | It was only used for toUpper/toLower but always computed in the constructor, including QString::toLatin1 conversion and allocations. This needlessly slows down all other uses, including supposedly "cheap" operations QString::toDouble, or accesses inside QResourceFileEngine. The benchmarks indicates that doing it always when needed is bearable. There's still a lot of improvement potential on these code paths. Change-Id: I88b637ee11f9f7ea614f8da4ec5df0bf40664fce Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* QDataStream: Be a bit more verbose about operator>>(char *&)hjk2013-04-231-5/+11
| | | | | | | | This also fixes a few "sloppy" mentionings of "new" into "new []". Task-number: QTBUG-30777 Change-Id: I3f4add07777b59cd09cac97b672c73273b3b97eb Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Use a QVector<QDateTime> instead of an array in QFileInfoPrivatehjk2013-04-233-1/+13
| | | | | | | | | | | | Since QDateTime is pimpled, default allocation is expensive and regularly shows up in profiles of code using QFileInfo. For Qt 6, QDateTime's data members should be put into the class proper, and this change here reverted. Change-Id: I94a50e467b12772e1076181eb2ac6031984d8802 Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Set the sysroot if cross compiling the cmake tests.Stephen Kelly2013-04-231-0/+4
| | | | | | Change-Id: Iae268f30b86a67fcf978983ca9b12f850948dd24 Reviewed-by: Volker Krause <volker.krause@kdab.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix QAbstractItemModel::moveColumn()J-P Nurmi2013-04-231-1/+1
| | | | | | | Task-number: QTBUG-30346 Change-Id: I3d6dbe1e88bb5e2748eadabb2663f30be16f8d18 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix QKeySequence::toString() returning gibberish for Qt::KeypadModifierMitch Curtis2013-04-231-0/+4
| | | | | | | | | | | | | This is the patch from the bug report with a few alterations to get it to compile, and also with the GroupSwitchModifier code removed, as this patch just focuses on Qt::KeypadModifier. The problem was determined to be in QKeySequencePrivate::encodeString, which doesn't handle the Qt::KeypadModifier flag. Task-number: QTBUG-4022 Change-Id: Ic981eb8b5cd88c7b36892d3019b8175db4b7b6f2 Reviewed-by: David Faure (KDE) <faure@kde.org>
* Document that the mutex passed to QWaitCondition::wait must be lockedThiago Macieira2013-04-221-2/+2
| | | | | | | | | Simply say that the behaviour is undefined if you don't do what you must do. I don't want to introduce a check: it can't be done reliably anyway. Task-number: QTBUG-30806 Change-Id: Iba1bbbdfe62ffcb133f9c52215efdcc0ee7bd9bd Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Mark that GCC 4.8.1 has support for C++11 member reference qualifiersThiago Macieira2013-04-201-0/+4
| | | | | | | | | | | | | This also marks it feature-complete for C++11 (at least, language features). See http://gcc.gnu.org/gcc-4.8/cxx0x_status.html and http://gcc.gnu.org/projects/cxx0x.html. Support for the C++11 features in the Standard Library is still incomplete, but we don't try to detect those features anyway (see http://gcc.gnu.org/onlinedocs/libstdc++/manual/status.html#status.iso.2011). Change-Id: I55702ef48f757b536ebbf17e921442ff5bfc29f8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Doc: added details for QRegisterStaticFunction(plugin)Nico Vertriest2013-04-191-1/+2
| | | | | | | | | Added reference to macro Q_IMPORT_PLUGIN() Task-number: QTBUG-30548 Change-Id: Ibc20ad52cd57d497f5a7fb5c4dd4a4c778e4a660 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qprocessordetection: add armv7sRichard Moe Gustavsen2013-04-191-0/+2
| | | | | | | | | | | | | | | | | | Xcode builds projects for armv7s if a compatible device is set as target device. If trying to include <QtCore/QtCore> into such projects, the build fails complaining about "the usage of sizeof missing QMutexData definition in qgenericatomic.h" The reason is that qprocessdetection.h fails to pick up that we're building for ARM, and includes qatomic_gcc.h instead of qatomic_armv7.h. So we need to check for __ARM_ARCH_7S__ as well. In addition, iPhoneOS6.1.sdk/usr/include/arm/arch.h will define _ARM_ARCH_7 if any of the more specic ARM defines are defined, so I add this check as well to more easy support new version of ARM7. Change-Id: Ic51a4d7ac99f7f6ba1065f870b3ef82d1250b56c Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Make sure to also check for null CFPropertyLists.Thiago Macieira2013-04-191-0/+3
| | | | | | | | | | In 1b08e0307dfebe561fbb0819a2d6b53edd8e8e93, I removed the null check by accident. It's possible for the Darwin API to return a null property list. Task-number: QTBUG-30760 Change-Id: Iaf0125767fe4b47c19810b70483a5219e94e4305 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* List the Qt5::WinMain Release configuration before the Debug one.Stephen Kelly2013-04-181-8/+8
| | | | | | | | | | | Apply the logic from commit d7ae34fdfde61838ce1e4fb13a945832841f61ab (List the Release library before the Debug library in cmake files., 2013-02-21) to the Qt5::WinMain library too. Task-number: QTBUG-29186 Change-Id: Ie465fef1cc0fc842d86c5bc69ab84ec65ec652d9 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Emit animation driver signals after we change the state.Gunnar Sletta2013-04-171-2/+2
| | | | | Change-Id: I4d5d6efdcb519cd4bb53626ae9412a4f5f130689 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Make QBuffer unbufferedThiago Macieira2013-04-161-1/+1
| | | | | | | | | | | | | Sounds non-sense but it means that QIODevice will not try to copy from QBuffer's buffer onto its own. Eventually we should figure out to make QBuffer use the QIODevice::buffer member that is already there and avoid all of this mistake. Something for the future. Change-Id: Ib700c9cadb46cec20a8ea5a69a488ded7104ac76 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Make QBuffer::bytesAvailable() workThiago Macieira2013-04-161-15/+4
| | | | | | | | | | | | | We don't need to keep an internal QBuffer position, we can just use the one from QIODevice::pos(). It will keep track of goings ahead and backwards for us, plus it will make the default bytesAvailable() work out-of-the-box too. This error was reported on IRC. Change-Id: I8559e8ee56edaa01ca8732c1f1012082ebe3a3f2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix QFSFileEngine::renameOverwrite for Windows Embedded Compact 7.Janne Anttila2013-04-151-0/+26
| | | | | | | | | | | | | Windows Embedded Compact 7 does not have MoveFileEx, simulate it with the available file I/O functions [1]. For more details please check the comments in source code. [1] http://msdn.microsoft.com/en-us/library/ee490588.aspx Change-Id: Ib0fb0ba84e2d070dee2f633af1b81bec132f4c17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Johannes Oikarinen <johannes.oikarinen@digia.com>
* Make qtbase compile with QT_NO_IMAGEFORMATPLUGINTasuku Suzuki2013-04-151-1/+6
| | | | | | | | qfeatures.h re-generated from qfeatures.txt because QT_NO_IMAGEFORMATPLUGIN was missing Change-Id: I1c9291529ec07f83f99c9cd08340cbfebda609b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Micro-optimization of list string list construction in qmetaobject.Jędrzej Nowacki2013-04-131-2/+4
| | | | | | | | We know the size of constructed list, so it may be worth to reserve memory space for it. Change-Id: Idad061bc1dbf5acecaec48d2e00ca3504b9db8b8 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix C++11 support in clang prior to 3.2Jan Kundrát2013-04-121-2/+2
| | | | | | | | | | | | | The comments in this file suggested that the bug was only present in clang/3.1. However, qRegisterMetaType was failing even on clang 3.2 ("tags/RELEASE_32/final"). The clang's bugzilla says [1] that the problem was fixed two days before the release of 3.2, but apparently it didn't make it to the release branch. [1] http://llvm.org/bugs/show_bug.cgi?id=13470 Change-Id: I37db8f6f6b22ab939110e79240d92313c1786d6a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Enable qDebug to console when desired on Android.Gunnar Sletta2013-04-121-1/+7
| | | | | Change-Id: I91906c5fc2a5b406f416c296c124a01795e69b8a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Only test cmake module versions if available for test.Stephen Kelly2013-04-111-18/+23
| | | | | | | | | | | | | | | | | The expected versions are only set if the cmake tests are set up by qmake by running qmake && make check If instead someone uses cmake directly: mkdir build && cd build && cmake .. && ctest the expected versions are not known, and the test fails without this patch. So, don't test the versions if they are not known. Change-Id: I2e8a4f651a69a8817c819d881be75ca07bc1bfd4 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QVector: Fix signedness warning in assert.Friedemann Kleint2013-04-111-1/+1
| | | | | | | Task-number: QTBUG-30331 Change-Id: I91b346b36162e8146a05babd24afa4bfb7259bec Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Merge "Merge branch 'release' into stable" into refs/staging/stableStephen Kelly2013-04-111-0/+1
|\
| * Merge branch 'release' into stableSergio Ahumada2013-04-101-0/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/widgets/styles/qwindowsvistastyle.cpp Change-Id: Ifd17532393ebab8ed454c6a79bab622959ceef95
| | * Clear the WA_QuitOnClose flag from EvalMessageBox.Michael Brüning2013-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The evaluation message box caused the QtWebProcess to quit due to the fact that the process has no other windows and EvalMessageBox was both set to be closed on quit and ended up being the last window in the process. Change-Id: Iad6461d014258fdc5fade7dafe48da33903377bb Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | | Make qt5_use_modules find dependents only in the parent directory.Stephen Kelly2013-04-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to 70420ec3 (Look for cmake package dependents only in the parent directory., 2013-04-02), make sure this cmake function only searches for sibling packages as dependencies. Change-Id: Icab23d333fa6a750ee262b592fae39f0ba334fee Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Make the umbrella Qt5 CMake Config file find components only in the parent ↵Stephen Kelly2013-04-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | directory. Similar to 70420ec3 (Look for cmake package dependents only in the parent directory., 2013-04-02), make sure cmake only searches for sibling packages as components. Change-Id: I9e0c13dfcdba28a9fd6892828b0f509dd63e6604 Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | | Use CMake facility for verbose makefiles instead of an env var.Stephen Kelly2013-04-101-0/+4
|/ / | | | | | | | | | | | | | | | | It should also have an effect for Visual Studio project files, not just makefile generators. Change-Id: I395071f09b29a6e8967a3d44e41d30480ae783f7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Remove QT_{BEGIN,END}_HEADERS macrosSergio Ahumada2013-04-101-4/+0
| | | | | | | | | | | | | | These macros are useless from Qt 5.1 on. Change-Id: I4574e87ef36e7bc67d2f1caa38c685a837708764 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: add row for Qt 5.0 datastream versionThiago Macieira2013-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | We seem to have two tables. That's a bad idea, but they are there. I won't add Qt 5.1 until we're certain that the datastream isn't changing. It's preferable to lack information than to show the wrong value. Change-Id: Ibc7eb95bbbf3b35388f910154372fdd896735430 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | mkspecs are installed to QT_HOST_DATA instead of QT_INSTALL_ARCHDATA.Volker Krause2013-04-081-3/+3
| | | | | | | | | | | | | | These are the same for normal builds, but differ when cross-compiling Qt. Change-Id: I75eccc6f4b67b440a08c4aba41aabb7df686c9f9 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Don't bypass overwritten [set]data() methods in the proxy.Volker Krause2013-04-081-4/+2
| | | | | | | | | | | | | | | | | | By calling itemData() of the source model directly, the result cannot contain data provided by the proxy model itself. The base class implementation however will call data() on the proxy instead. Change-Id: Ib0ef5f5621457adbfa4bd896a756dfcb98d0ae54 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | Fix MSVC warning about truncation from 64bit to 32bit int.Friedemann Kleint2013-04-061-1/+1
| | | | | | | | | | Change-Id: Id3e2f148aa430045d32d61b61eabc3f7197cbbf0 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* | Don't call virtual methods after the source model is destroyed.Stephen Kelly2013-04-052-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Calling clear_mapping causes the persistent indexes to be queried, and mapped using map_to_source, so that they can be restored later. That is not the appropriate response to the source model being deleted because there won't be anything to restore. Simply clear the stored mapping information instead so that the source model actually exists when mapToSource is called by the framework. Change-Id: I99692ee7aa9c6714aec45c68fe4a2d62be189d60 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Test that the CMake files create appropriate version variables.Stephen Kelly2013-04-051-1/+28
| | | | | | | | | | | | | | Change-Id: I1d8061302fbb8494b5ae31e20a644745fe969f10 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Brad King <brad.king@kitware.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* | QSaveFile: allow saving to a writable file in a non-writable directoryDavid Faure2013-04-053-17/+90
| | | | | | | | | | | | | | | | | | | | The only way to make this possible is to disable the atomic-rename-from-temp-file behavior. This is not done by default, but only if the application allows this to happen. https://bugs.kde.org/show_bug.cgi?id=312415 Change-Id: I71ce54ae1f7f50ab5e8379f04c0ede74ebe3136d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-04-032-1/+5
|\ \ | | | | | | | | | refs/staging/stable
| * \ Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-032-1/+5
| |\ \ | | |/ | | | | | | Change-Id: Icedabda08961326a0a447ec71f1b0f0f5df075eb
| | * qt.conf: default LibraryExecutables to bin/ on windowsOswald Buddenhagen2013-03-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this matches the platform-specific configure default. as a "side effect", this fixes the in-builddir execution of webkit examples, as the non-installed qmake now agrees with QLibraryInfo about the location of QWebProcess.exe. Task-number: QTBUG-30322 Change-Id: Id28f2c246e4bfda6d5f4d719a66a16f24bb7cdb7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| | * Doc: Fix typo in the property system documentationTopi Reinio2013-03-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | priorty -> priority Task-number: QTBUG-28756 Change-Id: I79138f49db78ee6d1b96e44585ae4c1565920b18 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Doc: Replaced canConvert() with canConvert(Int)Venu2013-04-031-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | This change amends my earlier change to make the function reference relevant to the example being discussed. Task-number: QTBUG-28204 Change-Id: I841a561ba117f83a96b8b4a3661cea2a7a3e47da Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | ApplicationState: Add new event class: ApplicationStateChangeEventRichard Moe Gustavsen2013-04-032-5/+9
| | | | | | | | | | | | | | | | | | | | | | This patch will follow up on e27ca37 (add more state to QT::ApplicationState), and add a new event class QApplicationStateChangeEvent with type Qt::ApplicationStateChange. Change-Id: Idee724f181f1fbb2321ddad7e0df00c88b3488b1 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* | qdoc: Use Q_QDOC in quuid.h to help qdocMartin Smith2013-04-031-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Some new ctor initializers were added that use curly braces. qdoc's dumb C++ parser can't handle curly braces in the ctor area; it thinks they are the body of the function. In this update, the Q_QDOC macro is used to isolate these problems so qdoc doesn't have to deal with them. Task-number: QTBUG-30254 Change-Id: Ie318e4ac58861f4ebd8a7b9f004d2677f850436e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Make sure QThreadData and QAdoptedThread object is destroyed at app exitjian liang2013-04-031-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-30134 Restore the lines in qcoreapplication.cpp removed by commit 950b35cf97ad398f97883efd2a18ee97994a8a9c to ensure QThreadData and QAdoptedThread object of main thread is destroyed at application exit. We don't set QCoreApplicationPriavte::theMainThread to 0 as before since it will be set to zero in QThreadData::~QThreadData() Change-Id: I8ee56aff5a933ce1d812b07fb00a29ed0839ab6e Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Use Bionic's __pthread_cond_timedwait_relativeThiago Macieira2013-04-021-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | The Linux futex interface uses relative timeouts anyway, so this avoids a double round-trip through clock_gettime: once in Qt code to calculate absolute from relative and once in libc for reversing. Glibc does not offer such a function because its pthread_cond objects use a kernel interface that works on absolute times. Change-Id: I8fbcd3f73d4364a16716b0eea17e8f5f9ab5cd05 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Add a function to do the relative waits, simplifying the code a littleThiago Macieira2013-04-021-3/+8
| | | | | | | | | | | | | | More to come. Change-Id: I108f23e94c322ad4e1466ff69100ad6af91d95e9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Fix build on Android: libpthread is deficient and lacks functionsThiago Macieira2013-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | Even if the monotonic clock is available, Android's Bionic lacks the pthread_condattr_setclock function, so we can't tell it to use the monotonic clock. Task-number: QTBUG-30450 Change-Id: I4f53708b1e834ff5d9462b3bf778b96c22662a04 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>