From 10b9e1b6b4deadfa35caefb0c8fdc5b69c63fe0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Tue, 12 Aug 2014 18:00:53 +0100 Subject: Fix QT_NO_REGULAREXPRESSION build Change-Id: Ibf1358733d7c5aa2c14cf46c23a24ba4da14143c Reviewed-by: Marc Mutz --- src/corelib/tools/qregularexpression.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/corelib') diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp index e1cf82bb8c..257141efdc 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp @@ -43,6 +43,8 @@ #include "qregularexpression.h" +#ifndef QT_NO_REGULAREXPRESSION + #include #include #include @@ -2495,3 +2497,5 @@ static const char *pcreCompileErrorCodes[] = #endif // #if 0 QT_END_NAMESPACE + +#endif // QT_NO_REGULAREXPRESSION -- cgit v1.2.1 From c6718f01c20779da00689b3ef66ede7af5fe8ce5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 12 Aug 2014 09:47:41 -0700 Subject: Correct the SYNC hint for the release barrier MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The MIPS32 manual I have says 0x11 is SYNC_ACQUIRE and 0x12 is SYNC_RELEASE. The change was an unintentional mistake in commit 60b6b28c213a420ee40e254ff1823876098e0a04. Thanks to Spencer Schumann for spotting this. Change-Id: I16885e4e86e8befa8931733d0b5a54ac9942f176 Reviewed-by: Spencer Schumann Reviewed-by: Olivier Goffart Reviewed-by: Lisandro Damián Nicanor Pérez Meyer --- src/corelib/arch/qatomic_mips.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h index 7bfe16a450..33e7053234 100644 --- a/src/corelib/arch/qatomic_mips.h +++ b/src/corelib/arch/qatomic_mips.h @@ -121,7 +121,7 @@ void QBasicAtomicOps::releaseMemoryFence(const T &) Q_DECL_NOTHROW { asm volatile (".set push\n" ".set mips32\n" - "sync 0x11\n" + "sync 0x12\n" ".set pop\n" ::: "memory"); } -- cgit v1.2.1 From 4848796f3e2f4aeebb8cbc0782853f27f93afeec Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 20 Jun 2014 10:37:51 -0700 Subject: Make sure we don't cache old file sizes prior to new writes If we write to a file, its size changes. We should drop previous size caches. Change-Id: Ib687c91e5fc88cab588c89023f23da9622160da9 Reviewed-by: Olivier Goffart Reviewed-by: Rafael Roquetto --- src/corelib/io/qfsfileengine.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/corelib') diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index 998a3334c9..1ae182a4c1 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -742,6 +742,9 @@ qint64 QFSFileEnginePrivate::writeFdFh(const char *data, qint64 len) if (len && writtenBytes == 0) { writtenBytes = -1; q->setError(errno == ENOSPC ? QFile::ResourceError : QFile::WriteError, qt_error_string(errno)); + } else { + // reset the cached size, if any + metaData.clearFlags(QFileSystemMetaData::SizeAttribute); } return writtenBytes; -- cgit v1.2.1 From 91e103d7571e3df88c70e0f043ccac0670191b62 Mon Sep 17 00:00:00 2001 From: Julien Brianceau Date: Thu, 14 Aug 2014 11:47:47 +0200 Subject: Fix x86/32-bit build when using an old version of gcc Versions prior to 4.3 don't define __SIZEOF_POINTER__ macro. Change-Id: I3144329778acd276e2fb885cb197a4532a15da70 Reviewed-by: Thiago Macieira --- src/corelib/global/qprocessordetection.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib') diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index c9fb728593..47d6dcd7f6 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -169,6 +169,7 @@ #elif defined(__i386) || defined(__i386__) || defined(_M_IX86) # define Q_PROCESSOR_X86_32 # define Q_BYTE_ORDER Q_LITTLE_ENDIAN +# define Q_PROCESSOR_WORDSIZE 4 /* * We define Q_PROCESSOR_X86 == 6 for anything above a equivalent or better -- cgit v1.2.1 From 2289f3ee2955f783baa6e18c7fe3418c302b011c Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Fri, 15 Aug 2014 22:15:34 +0200 Subject: Fix a memory leak in QFseventsFileSystemWatcherEngine Add a missing NSAutoReleasePool Task-number: QTBUG-38637 Change-Id: Ib69d92b6e9c4327cbb74f7814a45773bfc2ee526 Reviewed-by: Erik Verbruggen --- src/corelib/io/qfilesystemwatcher_fsevents.mm | 1 + 1 file changed, 1 insertion(+) (limited to 'src/corelib') diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.mm b/src/corelib/io/qfilesystemwatcher_fsevents.mm index 085396da6d..e713769735 100644 --- a/src/corelib/io/qfilesystemwatcher_fsevents.mm +++ b/src/corelib/io/qfilesystemwatcher_fsevents.mm @@ -496,6 +496,7 @@ QStringList QFseventsFileSystemWatcherEngine::removePaths(const QStringList &pat bool QFseventsFileSystemWatcherEngine::startStream() { Q_ASSERT(stream == 0); + Q_AUTORELEASE_POOL(pool) if (stream) // This shouldn't happen, but let's be nice and handle it. stopStream(); -- cgit v1.2.1 From 6b6e51e5abf56f938c27d194701e2bb20f3459dd Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Tue, 19 Aug 2014 15:00:30 +0200 Subject: OS X - QCollator::compare() returns wrong results. kUCCollateDigitsAsNumberMask works only if kUCCollateDigitsOverrideMask is also set. Update 0: - test added. Task-number: QTBUG-40777 Change-Id: I48bfec78f5f8439a51f8d749f0fc4397a72b29f2 Reviewed-by: Lars Knoll --- src/corelib/tools/qcollator_macx.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/tools/qcollator_macx.cpp index 877510489a..b9477afedb 100644 --- a/src/corelib/tools/qcollator_macx.cpp +++ b/src/corelib/tools/qcollator_macx.cpp @@ -96,9 +96,9 @@ void QCollator::setNumericMode(bool on) detach(); if (on) - d->collator.options |= kUCCollateDigitsAsNumberMask; + d->collator.options |= kUCCollateDigitsAsNumberMask | kUCCollateDigitsOverrideMask; else - d->collator.options &= ~kUCCollateDigitsAsNumberMask; + d->collator.options &= ~(kUCCollateDigitsAsNumberMask | kUCCollateDigitsOverrideMask); d->init(); } -- cgit v1.2.1 From 198009db79a85d3cab7fe3a6432635d36123a2d6 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 15 Aug 2014 15:55:12 +0200 Subject: Fix several regressions in font selection In Qt 5.3.0 a change was added which automatically adapts Common script to surrounding scripts in accordance with the Unicode tr#24. This broke *a lot* of cases of font selection because the font selection algorithm is not prepared for handling characters with adapted scripts. We need to disable this change for now and redo it later with patches to font selection to avoid the regressions. [ChangeLog][Text] Fixed several regressions in font selection when combining different writing systems in the same text. Task-number: QTBUG-39930 Task-number: QTBUG-39860 Change-Id: Id02b5ae2403c06542ed5d81e7c4deb2e0c7d816e Reviewed-by: Konstantin Ritt --- src/corelib/tools/qunicodetools.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/corelib') diff --git a/src/corelib/tools/qunicodetools.cpp b/src/corelib/tools/qunicodetools.cpp index fc36d07a4a..bb2c032e57 100644 --- a/src/corelib/tools/qunicodetools.cpp +++ b/src/corelib/tools/qunicodetools.cpp @@ -710,6 +710,7 @@ Q_CORE_EXPORT void initScripts(const ushort *string, int length, uchar *scripts) script = QChar::Script(prop->script); } +#if 0 // ### Disabled due to regressions. The font selection algorithm is not prepared for this change. if (Q_LIKELY(script != QChar::Script_Common)) { // override preceding Common-s while (sor > 0 && scripts[sor - 1] == QChar::Script_Common) @@ -719,6 +720,7 @@ Q_CORE_EXPORT void initScripts(const ushort *string, int length, uchar *scripts) if (sor > 0) script = scripts[sor - 1]; } +#endif while (sor < eor) scripts[sor++] = script; @@ -726,6 +728,8 @@ Q_CORE_EXPORT void initScripts(const ushort *string, int length, uchar *scripts) script = prop->script; } eor = length; + +#if 0 // ### Disabled due to regressions. The font selection algorithm is not prepared for this change. if (Q_LIKELY(script != QChar::Script_Common)) { // override preceding Common-s while (sor > 0 && scripts[sor - 1] == QChar::Script_Common) @@ -735,6 +739,8 @@ Q_CORE_EXPORT void initScripts(const ushort *string, int length, uchar *scripts) if (sor > 0) script = scripts[sor - 1]; } +#endif + while (sor < eor) scripts[sor++] = script; } -- cgit v1.2.1 From 9286fdf4a06f25fc6fa743346c6beef7438170cb Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Thu, 21 Aug 2014 12:05:49 +0200 Subject: Doc: corrected autolink errors Qjsonvalue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-40362 Change-Id: I2ae782ea606e8ee55ee0fcfbbb29db3216b0574b Reviewed-by: Martin Smith Reviewed-by: Topi Reiniö --- src/corelib/json/qjsonvalue.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/json/qjsonvalue.cpp b/src/corelib/json/qjsonvalue.cpp index 4c4838d314..4838a78217 100644 --- a/src/corelib/json/qjsonvalue.cpp +++ b/src/corelib/json/qjsonvalue.cpp @@ -420,17 +420,17 @@ QJsonValue QJsonValue::fromVariant(const QVariant &variant) } /*! - Converts the value to a QVariant. + Converts the value to a \l {QVariant::}{QVariant()}. The QJsonValue types will be converted as follows: - \value Null QVariant() + \value Null {QVariant::}{QVariant()} \value Bool QMetaType::Bool \value Double QMetaType::Double \value String QString \value Array QVariantList \value Object QVariantMap - \value Undefined QVariant() + \value Undefined {QVariant::}{QVariant()} \sa fromVariant() */ @@ -553,7 +553,7 @@ QJsonArray QJsonValue::toArray(const QJsonArray &defaultValue) const Converts the value to an array and returns it. - If type() is not Array, a QJsonArray() will be returned. + If type() is not Array, a \l{QJsonArray::}{QJsonArray()} will be returned. */ QJsonArray QJsonValue::toArray() const { @@ -578,8 +578,8 @@ QJsonObject QJsonValue::toObject(const QJsonObject &defaultValue) const Converts the value to an object and returns it. - If type() is not Object, the QJsonObject() will be returned. - */ + If type() is not Object, the \l {QJsonObject::}{QJsonObject()} will be returned. +*/ QJsonObject QJsonValue::toObject() const { return toObject(QJsonObject()); -- cgit v1.2.1 From 1498c99e9d5fac758bd9372e199366059af81a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Martins?= Date: Sun, 24 Aug 2014 17:09:55 +0100 Subject: BlackBerry PlayBook build fixes Change-Id: I32b232883bb29ca7305bca1da1df263f106ddd93 Reviewed-by: Rafael Roquetto --- src/corelib/kernel/kernel.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 819c10e99f..55625f3571 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -169,7 +169,7 @@ blackberry { kernel/qeventdispatcher_blackberry_p.h } -qqnx_pps { +qqnx_pps:!blackberry-playbook { LIBS_PRIVATE += -lpps SOURCES += \ kernel/qppsattribute.cpp \ -- cgit v1.2.1 From 2529a8aaa2f5781f0d665f377a848626439c2de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Wed, 6 Aug 2014 17:24:52 +0200 Subject: Android: Avoid caching the same class twice. The class name scheme can be separated by '/' or '.', if both formats where used we would end-up caching those classes twice. Change-Id: I3ae69694d6a8616bbaadfb3c2d0717fbf9ccb9fc Reviewed-by: Yoann Lopes --- src/corelib/kernel/qjni.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp index 4581b70ca7..b240185d7e 100644 --- a/src/corelib/kernel/qjni.cpp +++ b/src/corelib/kernel/qjni.cpp @@ -86,15 +86,14 @@ Q_GLOBAL_STATIC(JClassHash, cachedClasses) static jclass getCachedClass(JNIEnv *env, const char *className) { jclass clazz = 0; - QString key = QLatin1String(className); - QHash::iterator it = cachedClasses->find(key); + QString classDotEnc = QString::fromLatin1(className).replace(QLatin1Char('/'), QLatin1Char('.')); + QHash::iterator it = cachedClasses->find(classDotEnc); if (it == cachedClasses->end()) { QJNIObjectPrivate classLoader = QtAndroidPrivate::classLoader(); if (!classLoader.isValid()) return 0; - QJNIObjectPrivate stringName = QJNIObjectPrivate::fromString(QString::fromLatin1(className).replace(QLatin1Char('/'), - QLatin1Char('.'))); + QJNIObjectPrivate stringName = QJNIObjectPrivate::fromString(classDotEnc); QJNIObjectPrivate classObject = classLoader.callObjectMethod("loadClass", "(Ljava/lang/String;)Ljava/lang/Class;", stringName.object()); @@ -102,7 +101,7 @@ static jclass getCachedClass(JNIEnv *env, const char *className) if (!exceptionCheckAndClear(env) && classObject.isValid()) clazz = static_cast(env->NewGlobalRef(classObject.object())); - cachedClasses->insert(key, clazz); + cachedClasses->insert(classDotEnc, clazz); } else { clazz = it.value(); } -- cgit v1.2.1 From 8e96e73ebce9e0e7bd9c9f55eb545c442fe93a70 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Thu, 14 Aug 2014 16:08:27 +0200 Subject: Doc: corrected autolink errors corelib io Task-number: QTBUG-40362 Change-Id: If11700d57db75ad7605bd8d53681002639c2e785 Reviewed-by: Jerome Pasion --- src/corelib/io/qfile.cpp | 6 +++--- src/corelib/io/qfiledevice.cpp | 2 +- src/corelib/io/qiodevice.cpp | 18 +++++++++--------- src/corelib/io/qprocess.cpp | 10 +++++----- src/corelib/io/qtemporaryfile.cpp | 10 ++++++---- src/corelib/io/qtextstream.cpp | 2 +- src/corelib/io/qurl.cpp | 29 ++++++++++++++--------------- 7 files changed, 39 insertions(+), 38 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 82aee331c5..feecbd0281 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -167,7 +167,7 @@ QAbstractFileEngine *QFilePrivate::engine() const disk into a 16-bit Unicode QString. By default, it assumes that the user system's local 8-bit encoding is used (e.g., UTF-8 on most unix based operating systems; see QTextCodec::codecForLocale() for - details). This can be changed using setCodec(). + details). This can be changed using \l QTextStream::setCodec(). To write text, we can use operator<<(), which is overloaded to take a QTextStream on the left and various data types (including @@ -987,8 +987,8 @@ bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags) those cases, size() returns \c 0. See QIODevice::isSequential() for more information. - \warning For Windows CE you may not be able to call seek(), setSize(), - fileTime(). size() returns \c 0. + \warning For Windows CE you may not be able to call seek(), and size() + returns \c 0. \warning Since this function opens the file without specifying the file name, you cannot use this QFile with a QFileInfo. diff --git a/src/corelib/io/qfiledevice.cpp b/src/corelib/io/qfiledevice.cpp index f7e58a7bed..f9a79cdca0 100644 --- a/src/corelib/io/qfiledevice.cpp +++ b/src/corelib/io/qfiledevice.cpp @@ -269,7 +269,7 @@ int QFileDevice::handle() const /*! Returns the name of the file. - The default implementation in QFileDevice returns QString(). + The default implementation in QFileDevice returns a null string. */ QString QFileDevice::fileName() const { diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 53019e1ff4..7b0557a497 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -217,7 +217,7 @@ QIODevicePrivate::~QIODevicePrivate() \li waitFor....() - Subclasses of QIODevice implement blocking functions for device-specific operations. For example, QProcess - has a function called waitForStarted() which suspends operation in + has a function called \l {QProcess::}{waitForStarted()} which suspends operation in the calling thread until the process has started. \endlist @@ -730,8 +730,7 @@ qint64 QIODevice::bytesAvailable() const return d->buffer.size(); } -/*! - For buffered devices, this function returns the number of bytes +/*! For buffered devices, this function returns the number of bytes waiting to be written. For devices with no buffer, this function returns 0. @@ -943,9 +942,10 @@ qint64 QIODevice::read(char *data, qint64 maxSize) data read as a QByteArray. This function has no way of reporting errors; returning an empty - QByteArray() can mean either that no data was currently available + QByteArray can mean either that no data was currently available for reading, or that an error occurred. */ + QByteArray QIODevice::read(qint64 maxSize) { Q_D(QIODevice); @@ -994,10 +994,10 @@ QByteArray QIODevice::read(qint64 maxSize) \overload Reads all available data from the device, and returns it as a - QByteArray. + byte array. This function has no way of reporting errors; returning an empty - QByteArray() can mean either that no data was currently available + QByteArray can mean either that no data was currently available for reading, or that an error occurred. */ QByteArray QIODevice::readAll() @@ -1173,10 +1173,10 @@ qint64 QIODevice::readLine(char *data, qint64 maxSize) \overload Reads a line from the device, but no more than \a maxSize characters, - and returns the result as a QByteArray. + and returns the result as a byte array. This function has no way of reporting errors; returning an empty - QByteArray() can mean either that no data was currently available + QByteArray can mean either that no data was currently available for reading, or that an error occurred. */ QByteArray QIODevice::readLine(qint64 maxSize) @@ -1527,7 +1527,7 @@ qint64 QIODevice::peek(char *data, qint64 maxSize) \snippet code/src_corelib_io_qiodevice.cpp 5 This function has no way of reporting errors; returning an empty - QByteArray() can mean either that no data was currently available + QByteArray can mean either that no data was currently available for peeking, or that an error occurred. \sa read() diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index b03e96d0f6..66036fca90 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -1689,8 +1689,8 @@ void QProcess::setEnvironment(const QStringList &environment) \deprecated Returns the environment that QProcess will use when starting a process, or an empty QStringList if no environment has been set - using setEnvironment() or setEnvironmentHash(). If no environment - has been set, the environment of the calling process will be used. + using setEnvironment(). If no environment has been set, the + environment of the calling process will be used. \note The environment settings are ignored on Windows CE, as there is no concept of an environment. @@ -2016,7 +2016,7 @@ QByteArray QProcess::readAllStandardError() \note No further splitting of the arguments is performed. \b{Windows:} The arguments are quoted and joined into a command line - that is compatible with the CommandLineToArgvW() Windows function. + that is compatible with the \c CommandLineToArgvW() Windows function. For programs that have different command line quoting requirements, you need to use setNativeArguments(). @@ -2320,8 +2320,8 @@ int QProcess::exitCode() const Returns the exit status of the last process that finished. - On Windows, if the process was terminated with TerminateProcess() - from another application this function will still return NormalExit + On Windows, if the process was terminated with TerminateProcess() from + another application, this function will still return NormalExit unless the exit code is less than 0. */ QProcess::ExitStatus QProcess::exitStatus() const diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index 3cade0ed25..d88ffb7c84 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -700,18 +700,20 @@ void QTemporaryFile::setFileTemplate(const QString &name) /*! - If \a file is not already a native file then a QTemporaryFile is created - in the tempPath() and \a file is copied into the temporary file, then a - pointer to the temporary file is returned. If \a file is already a native - file, a QTemporaryFile is not created, no copy is made and 0 is returned. + If \a file is not already a native file, then a QTemporaryFile is created + in QDir::tempPath(), the contents of \a file is copied into it, and a pointer + to the temporary file is returned. Does nothing and returns \c 0 if \a file + is already a native file. For example: + \code QFile f(":/resources/file.txt"); QTemporaryFile::createNativeFile(f); // Returns a pointer to a temporary file QFile f("/users/qt/file.txt"); QTemporaryFile::createNativeFile(f); // Returns 0 + \endcode \sa QFileInfo::isNativePath() */ diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp index 288a939ab2..b67df6a4a6 100644 --- a/src/corelib/io/qtextstream.cpp +++ b/src/corelib/io/qtextstream.cpp @@ -2822,7 +2822,7 @@ QTextStream &reset(QTextStream &stream) /*! \relates QTextStream - Calls skipWhiteSpace() on \a stream and returns \a stream. + Calls \l {QTextStream::}{skipWhiteSpace()} on \a stream and returns \a stream. \sa {QTextStream manipulators} */ diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 7018b333f2..c109fc4d3a 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -2315,7 +2315,7 @@ void QUrl::setHost(const QString &host, ParsingMode mode) as DNS requests or in HTTP request headers). If that flag is not present, this function returns the International Domain Name (IDN) in Unicode form, according to the list of permissible top-level domains (see - idnWhiteList()). + idnWhitelist()). All other flags are ignored. Host names cannot contain control or percent characters, so the returned value can be considered fully decoded. @@ -2656,8 +2656,8 @@ void QUrl::setQuery(const QUrlQuery &query) Sets the query string of the URL to an encoded version of \a query. The contents of \a query are converted to a string internally, each pair delimited by the character returned by - pairDelimiter(), and the key and value are delimited by - valueDelimiter(). + queryPairDelimiter(), and the key and value are delimited by + queryValueDelimiter(). \note This method does not encode spaces (ASCII 0x20) as plus (+) signs, like HTML forms do. If you need that kind of encoding, you must encode @@ -2676,8 +2676,8 @@ void QUrl::setQuery(const QUrlQuery &query) Sets the query string of the URL to the encoded version of \a query. The contents of \a query are converted to a string internally, each pair delimited by the character returned by - pairDelimiter(), and the key and value are delimited by - valueDelimiter(). + queryPairDelimiter(), and the key and value are delimited by + queryValueDelimiter(). \obsolete Use QUrlQuery and setQuery(). @@ -2691,11 +2691,11 @@ void QUrl::setQuery(const QUrlQuery &query) Inserts the pair \a key = \a value into the query string of the URL. - The key/value pair is encoded before it is added to the query. The + The key-value pair is encoded before it is added to the query. The pair is converted into separate strings internally. The \a key and \a value is first encoded into UTF-8 and then delimited by the - character returned by valueDelimiter(). Each key/value pair is - delimited by the character returned by pairDelimiter(). + character returned by queryValueDelimiter(). Each key-value pair is + delimited by the character returned by queryPairDelimiter(). \note This method does not encode spaces (ASCII 0x20) as plus (+) signs, like HTML forms do. If you need that kind of encoding, you must encode @@ -2929,9 +2929,8 @@ QString QUrl::query(ComponentFormattingOptions options) const The fragment is sometimes also referred to as the URL "reference". Passing an argument of QString() (a null QString) will unset the fragment. - Passing an argument of QString("") (an empty but not null QString) - will set the fragment to an empty string (as if the original URL - had a lone "#"). + Passing an argument of QString("") (an empty but not null QString) will set the + fragment to an empty string (as if the original URL had a lone "#"). The \a fragment data is interpreted according to \a mode: in StrictMode, any '%' characters must be followed by exactly two hexadecimal characters @@ -3006,10 +3005,10 @@ QString QUrl::fragment(ComponentFormattingOptions options) const The fragment is sometimes also referred to as the URL "reference". - Passing an argument of QByteArray() (a null QByteArray) will unset - the fragment. Passing an argument of QByteArray("") (an empty but - not null QByteArray) will set the fragment to an empty string (as - if the original URL had a lone "#"). + Passing an argument of QByteArray() (a null QByteArray) will unset the fragment. + Passing an argument of QByteArray("") (an empty but not null QByteArray) + will set the fragment to an empty string (as if the original URL + had a lone "#"). \obsolete Use setFragment(), which has the same behavior of null / empty. -- cgit v1.2.1 From f2e4ff4fd484d49e7338c9a2c5882782fe8f081b Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Wed, 27 Aug 2014 12:12:50 +0200 Subject: Also print the class name in the QObject::killTimer error msg. When no objectName is set, this will give at least some information, other than the memory address of the current instance. Change-Id: Iae452c0e9fe38f0aab35094ddf0edc0fd6b28c20 Reviewed-by: Olivier Goffart --- src/corelib/kernel/qobject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index e714168e16..e588808ee8 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1636,9 +1636,10 @@ void QObject::killTimer(int id) int at = d->extraData ? d->extraData->runningTimers.indexOf(id) : -1; if (at == -1) { // timer isn't owned by this object - qWarning("QObject::killTimer(): Error: timer id %d is not valid for object %p (%s), timer has not been killed", + qWarning("QObject::killTimer(): Error: timer id %d is not valid for object %p (%s, %s), timer has not been killed", id, this, + metaObject()->className(), qPrintable(objectName())); return; } -- cgit v1.2.1 From e5a332ae54b4aaf598b6b97a3e7e5f876abf28f4 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Fri, 29 Aug 2014 11:33:21 +0200 Subject: Bump version Change-Id: I3aa94110b11e181dea1b8551982ce16dab57f893 --- src/corelib/global/qglobal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 255eb6c00b..c159ea172d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -45,11 +45,11 @@ #include -#define QT_VERSION_STR "5.3.2" +#define QT_VERSION_STR "5.3.3" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x050302 +#define QT_VERSION 0x050303 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ -- cgit v1.2.1 From 8206a263ab9bca7fef191d299c05294a00ec1c8f Mon Sep 17 00:00:00 2001 From: Samuel Gaist Date: Sat, 30 Aug 2014 00:40:33 +0200 Subject: Add missing private headers warning Change-Id: I7a4dd22ea3bcebf4c3ec3ad731628fd8f3c247e0 Reviewed-by: Thiago Macieira --- src/corelib/io/qdir_p.h | 11 +++++++++++ src/corelib/io/qtemporaryfile_p.h | 11 +++++++++++ src/corelib/kernel/qeventloop_p.h | 11 +++++++++++ src/corelib/kernel/qmetaobject_moc_p.h | 11 +++++++++++ src/corelib/mimetypes/qmimedatabase_p.h | 11 +++++++++++ src/corelib/mimetypes/qmimeglobpattern_p.h | 11 +++++++++++ src/corelib/mimetypes/qmimemagicrule_p.h | 11 +++++++++++ src/corelib/mimetypes/qmimemagicrulematcher_p.h | 11 +++++++++++ src/corelib/mimetypes/qmimeprovider_p.h | 11 +++++++++++ src/corelib/mimetypes/qmimetype_p.h | 11 +++++++++++ src/corelib/mimetypes/qmimetypeparser_p.h | 11 +++++++++++ src/corelib/plugin/qsystemlibrary_p.h | 11 +++++++++++ src/corelib/tools/qcollator_p.h | 11 +++++++++++ src/corelib/tools/qsimd_p.h | 11 +++++++++++ src/corelib/tools/qstringiterator_p.h | 11 +++++++++++ 15 files changed, 165 insertions(+) (limited to 'src/corelib') diff --git a/src/corelib/io/qdir_p.h b/src/corelib/io/qdir_p.h index bf7726db2f..4d2f25f9ba 100644 --- a/src/corelib/io/qdir_p.h +++ b/src/corelib/io/qdir_p.h @@ -42,6 +42,17 @@ #ifndef QDIR_P_H #define QDIR_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qfilesystementry_p.h" #include "qfilesystemmetadata_p.h" diff --git a/src/corelib/io/qtemporaryfile_p.h b/src/corelib/io/qtemporaryfile_p.h index fe637c8dfd..46e9d169f4 100644 --- a/src/corelib/io/qtemporaryfile_p.h +++ b/src/corelib/io/qtemporaryfile_p.h @@ -42,6 +42,17 @@ #ifndef QTEMPORARYFILE_P_H #define QTEMPORARYFILE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #ifndef QT_NO_TEMPORARYFILE diff --git a/src/corelib/kernel/qeventloop_p.h b/src/corelib/kernel/qeventloop_p.h index 30c61ca759..1a1743260b 100644 --- a/src/corelib/kernel/qeventloop_p.h +++ b/src/corelib/kernel/qeventloop_p.h @@ -42,6 +42,17 @@ #ifndef QEVENTLOOP_P_H #define QEVENTLOOP_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qobject_p.h" QT_BEGIN_NAMESPACE diff --git a/src/corelib/kernel/qmetaobject_moc_p.h b/src/corelib/kernel/qmetaobject_moc_p.h index d26cd54e5d..1a7ca63ae1 100644 --- a/src/corelib/kernel/qmetaobject_moc_p.h +++ b/src/corelib/kernel/qmetaobject_moc_p.h @@ -43,6 +43,17 @@ # error "Include qmetaobject_p.h (or moc's utils.h) before including this file." #endif +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + QT_BEGIN_NAMESPACE // This function is shared with moc.cpp. This file should be included where needed. diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h index 78bb6c2780..d0546cf5ce 100644 --- a/src/corelib/mimetypes/qmimedatabase_p.h +++ b/src/corelib/mimetypes/qmimedatabase_p.h @@ -42,6 +42,17 @@ #ifndef QMIMEDATABASE_P_H #define QMIMEDATABASE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #include diff --git a/src/corelib/mimetypes/qmimeglobpattern_p.h b/src/corelib/mimetypes/qmimeglobpattern_p.h index ca22aa9588..05d701e787 100644 --- a/src/corelib/mimetypes/qmimeglobpattern_p.h +++ b/src/corelib/mimetypes/qmimeglobpattern_p.h @@ -42,6 +42,17 @@ #ifndef QMIMEGLOBPATTERN_P_H #define QMIMEGLOBPATTERN_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #include diff --git a/src/corelib/mimetypes/qmimemagicrule_p.h b/src/corelib/mimetypes/qmimemagicrule_p.h index c252440d6c..aeed1908a7 100644 --- a/src/corelib/mimetypes/qmimemagicrule_p.h +++ b/src/corelib/mimetypes/qmimemagicrule_p.h @@ -42,6 +42,17 @@ #ifndef QMIMEMAGICRULE_P_H #define QMIMEMAGICRULE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #include #include diff --git a/src/corelib/mimetypes/qmimemagicrulematcher_p.h b/src/corelib/mimetypes/qmimemagicrulematcher_p.h index 159342482f..49de59f55a 100644 --- a/src/corelib/mimetypes/qmimemagicrulematcher_p.h +++ b/src/corelib/mimetypes/qmimemagicrulematcher_p.h @@ -42,6 +42,17 @@ #ifndef QMIMEMAGICRULEMATCHER_P_H #define QMIMEMAGICRULEMATCHER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #include #include diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h index 4a263093bd..f79373bb0a 100644 --- a/src/corelib/mimetypes/qmimeprovider_p.h +++ b/src/corelib/mimetypes/qmimeprovider_p.h @@ -42,6 +42,17 @@ #ifndef QMIMEPROVIDER_P_H #define QMIMEPROVIDER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #include "qmimedatabase_p.h" #include diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index c500520fe1..637c85d8ca 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_p.h @@ -42,6 +42,17 @@ #ifndef QMIMETYPE_P_H #define QMIMETYPE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qmimetype.h" #include diff --git a/src/corelib/mimetypes/qmimetypeparser_p.h b/src/corelib/mimetypes/qmimetypeparser_p.h index c92bb81be4..ef7a12cdd5 100644 --- a/src/corelib/mimetypes/qmimetypeparser_p.h +++ b/src/corelib/mimetypes/qmimetypeparser_p.h @@ -43,6 +43,17 @@ #ifndef QMIMETYPEPARSER_P_H #define QMIMETYPEPARSER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qmimedatabase_p.h" #include "qmimeprovider_p.h" diff --git a/src/corelib/plugin/qsystemlibrary_p.h b/src/corelib/plugin/qsystemlibrary_p.h index 4a2c86990f..8b0fd57faf 100644 --- a/src/corelib/plugin/qsystemlibrary_p.h +++ b/src/corelib/plugin/qsystemlibrary_p.h @@ -42,6 +42,17 @@ #ifndef QSYSTEMLIBRARY_P_H #define QSYSTEMLIBRARY_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #ifdef Q_OS_WIN # include diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h index 50e1a01f82..526521ebf4 100644 --- a/src/corelib/tools/qcollator_p.h +++ b/src/corelib/tools/qcollator_p.h @@ -43,6 +43,17 @@ #ifndef QCOLLATOR_P_H #define QCOLLATOR_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qcollator.h" #include #ifdef QT_USE_ICU diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index e1c22bac71..b8dd3b101e 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -42,6 +42,17 @@ #ifndef QSIMD_P_H #define QSIMD_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include #include diff --git a/src/corelib/tools/qstringiterator_p.h b/src/corelib/tools/qstringiterator_p.h index c3986f0477..4ae705b085 100644 --- a/src/corelib/tools/qstringiterator_p.h +++ b/src/corelib/tools/qstringiterator_p.h @@ -43,6 +43,17 @@ #ifndef QSTRINGITERATOR_H #define QSTRINGITERATOR_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include QT_BEGIN_NAMESPACE -- cgit v1.2.1 From 61b47cd16693096072c1270bc5c7ee62873c0425 Mon Sep 17 00:00:00 2001 From: John Brooks Date: Fri, 29 Aug 2014 01:03:49 -0600 Subject: Correct QString::toStdString documentation on encoding This statement was left from when toAscii was used, instead of toUtf8. There is no loss of information when converting to UTF-8. Change-Id: Iad92977af319b324cbf06f1a24712b31a7836622 Reviewed-by: Louai Al-Khanji Reviewed-by: Robin Burchell Reviewed-by: Thiago Macieira --- src/corelib/tools/qstring.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 6c8db11212..3b18d31547 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -1306,9 +1306,6 @@ const QString::Null QString::null = { }; Returns a copy of the \a str string. The given string is converted to Unicode using the fromUtf8() function. - This constructor is only available if Qt is configured with STL - compatibility enabled. - \sa fromLatin1(), fromLocal8Bit(), fromUtf8() */ @@ -1341,7 +1338,7 @@ const QString::Null QString::null = { }; wchar_t is 2 bytes wide (e.g. windows) and in ucs4 on platforms where wchar_t is 4 bytes wide (most Unix systems). - This operator is mostly useful to pass a QString to a function + This method is mostly useful to pass a QString to a function that accepts a std::wstring object. \sa utf16(), toLatin1(), toUtf8(), toLocal8Bit() @@ -7720,12 +7717,9 @@ bool QString::isRightToLeft() const QString. The Unicode data is converted into 8-bit characters using the toUtf8() function. - This operator is mostly useful to pass a QString to a function + This method is mostly useful to pass a QString to a function that accepts a std::string object. - If the QString contains non-Latin1 Unicode characters, using this - can lead to loss of information. - \sa toLatin1(), toUtf8(), toLocal8Bit() */ -- cgit v1.2.1 From 1126701f8c459b92aee8a08befaf8e4ec216fd46 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Mon, 1 Sep 2014 14:53:14 +0200 Subject: cocoa: don't override NSApplication-sendEvent if configured as AA_MacPluginApplication MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I48cebbcb814ee8e97583c3165e7cb668077cfbad Task-number: QTBUG-40409 Reviewed-by: Morten Johan Sørvig --- src/corelib/global/qnamespace.qdoc | 2 +- src/corelib/kernel/qcoreapplication.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index a47f2e2945..50697e82a7 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -125,7 +125,7 @@ to author a plugin. This includes avoiding loading our nib for the main menu and not taking possession of the native menu bar. When setting this attribute to true will also set the AA_DontUseNativeMenuBar attribute - to true. + to true. It also disables native event filters. \value AA_DontUseNativeMenuBar All menubars created while this attribute is set to true won't be used as a native menubar (e.g, the menubar at diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 6868eb6a1e..82c157ee7f 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2528,6 +2528,9 @@ void QCoreApplication::removeLibraryPath(const QString &path) \note The filter function set here receives native messages, i.e. MSG or XCB event structs. + \note Native event filters will be disabled when the application the + Qt::AA_MacPluginApplication attribute is set. + For maximum portability, you should always try to use QEvents and QObject::installEventFilter() whenever possible. @@ -2537,6 +2540,11 @@ void QCoreApplication::removeLibraryPath(const QString &path) */ void QCoreApplication::installNativeEventFilter(QAbstractNativeEventFilter *filterObj) { + if (QCoreApplication::testAttribute(Qt::AA_MacPluginApplication)) { + qWarning("Native event filters are not applied when the Qt::AA_MacPluginApplication attribute is set"); + return; + } + QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(QCoreApplicationPrivate::theMainThread); if (!filterObj || !eventDispatcher) return; -- cgit v1.2.1 From 0fa0608f707306cb34a9ca91952cebbac25065a5 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 28 Aug 2014 15:22:35 +0200 Subject: Logging: Remove use of _declspec(thread) thread-local variables are known to be broken on Windows XP if the library is loaded dynamically. This has been fixed since Windows Vista, but to avoid any elaborate runtime checking of the OS version we're just removing the logic alltogether for MSVC / Windows. Task-number: QTBUG-41008 Change-Id: I64ee95270d142294c975a5890d6e1b62a833b6ef Reviewed-by: Thiago Macieira --- src/corelib/global/qlogging.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index ca0fb1bb23..51169eb963 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -1282,12 +1282,9 @@ static void qDefaultMsgHandler(QtMsgType type, const char *buf) qDefaultMessageHandler(type, emptyContext, QString::fromLocal8Bit(buf)); } -#if defined(Q_COMPILER_THREAD_LOCAL) || (defined(Q_CC_MSVC) && !defined(Q_OS_WINCE)) -#if defined(Q_CC_MSVC) -static __declspec(thread) bool msgHandlerGrabbed = false; -#else +#if defined(Q_COMPILER_THREAD_LOCAL) + static thread_local bool msgHandlerGrabbed = false; -#endif static bool grabMessageHandler() { @@ -1306,7 +1303,7 @@ static void ungrabMessageHandler() #else static bool grabMessageHandler() { return true; } static void ungrabMessageHandler() { } -#endif // (Q_COMPILER_THREAD_LOCAL) || ((Q_CC_MSVC) && !(Q_OS_WINCE)) +#endif // (Q_COMPILER_THREAD_LOCAL) static void qt_message_print(QtMsgType msgType, const QMessageLogContext &context, const QString &message) { -- cgit v1.2.1 From 1fa3627423a73fe19333e2e016feb35cdf8cd1ea Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Wed, 17 Sep 2014 14:08:38 -0500 Subject: Remove reference to removed qatomic_sparc.h qatomic_sparc.h was removed previously as part of general cleanup of old atomic code for Qt 5.3. Unfortunately SPARC include reference was not removed resulting in build failure on that platform. Task-number: QTBUG-41384 Change-Id: Ic6e31b32324b0e5dd3700a6a21515a8eea5668bd Reviewed-by: Thiago Macieira --- src/corelib/thread/qbasicatomic.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index cf69d34589..0fe4d20bc5 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -62,8 +62,6 @@ # include "QtCore/qatomic_ia64.h" #elif defined(Q_PROCESSOR_MIPS) # include "QtCore/qatomic_mips.h" -#elif defined(Q_PROCESSOR_SPARC) -# include "QtCore/qatomic_sparc.h" #elif defined(Q_PROCESSOR_X86) # include -- cgit v1.2.1