| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Benjamin Poulain
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Benjamin Poulain
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This commit makes no code change at all.
Write down the conclusions from experimenting with the x86 SIMD
instructions for faster string comparison routines. Long story short:
we're already pretty good.
The SSE4.2 string instructions are probably more useful for
"implicit-length mode" (that is, the end of the string is marked by a
NUL), rather than QString's "explicit-length mode".
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: Benjamin Poulain
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Some compilers are compatible with one another. In particular, the
Intel CC on Unix systems is compatible with g++ on the same system.
We should be saving the ABI "name" in the build key, not the compiler
name, but it's too late for that. Choose "g++-{VERSION}" as the
standard ABI name and make ICC support that.
Reviewed-by: Bradley T. Hughes
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A CDir was not deleted on several return paths in
QSysInfo::s60Version(). This fix uses a QScopedPointer to clean up the
CDir no matter what return path is taken.
Reviewed-by: Simon Hausmann
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: related to QTBUG-13079
Reviewed-by: Joao
|
| | |/ / /
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13079
Reviewed-by: Joao
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QString::split has overload, and if you want to take the address of a
function with overload, you need to cast it. If we really wanted to use
QString::split, we would have to do
QFuture<QStringList> future = QtConcurrent::run(string, static_cast<QStringList (QString::*)(const QString &, QString::SplitBehavior, Qt::CaseSensitivity ) const>(&QString::split), QString (", "), QString::KeepEmptyParts, Qt::CaseSensitive);
So use QByteArray::split as an example instead
Task-number: QTBUG-12897
Reviewed-by: David Boddie
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If QProcessManager destructor is ran as part of global static cleanup,
manager thread will most likely be terminated by kernel at that point,
so trying to delete QProcessActives and QProcessMediators will panic as
they will still be active. They can also no longer be properly canceled
as the thread is already gone. In case manager thread has already died,
which implies that process exit is imminent, we simply do nothing and
let the deletion of the main heap at process exit take care of stray
objects.
Task-number: QTBUG-11218
Reviewed-by: Janne Koskinen
|
| | | | |
| | | |
| | | |
| | | | |
Fixed typo in QPointer documentation. Task: QTBUG-13056
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed by: David Boddie
Tasks: QTBUG-10011, QTBUG-3205
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed by: David Boddie
Task: QTBUG-9984
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed by: David Boddie
Tasks: QTBUG-11926, QTBUG-10174
|
| |\ \ \ \
| |/ / /
|/| | | |
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-9239
Reviewed-by: joao
Conflicts:
src/corelib/tools/qstring.cpp
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Do not keep the libraryPathMutex locked while calling QFactoryLoader::refreshAll
QFactoryLoader also lock a mutex, and recurse into QCoreApplication::libraryPath
Reviewed-by: Brad
Helgrind warning for reference:
==8442== Thread #1: lock order "0xDEBA470 before 0xDF63600" violated
==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102)
==8442== by 0x8025A8E: QCoreApplication::libraryPaths() (qcoreapplication.cpp:2234)
==8442== by 0x8006FDC: QFactoryLoader::update() (qfactoryloader.cpp:109)
==8442== by 0x8006F32: QFactoryLoader::QFactoryLoader(char const*, QString const&, Qt::CaseSensitivity) (qfactoryloader.cpp:99)
==8442== by 0x6DE4351: qt_guiPlatformPlugin() (qguiplatformplugin.cpp:101)
==8442== by 0x6DE7A5B: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:934)
==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111)
==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323)
==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793)
==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712)
==8442== by 0x41350F: main (tst_examples.cpp:227)
==8442== Required order was established by acquisition of lock at 0xDEBA470
==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102)
==8442== by 0x8025FC3: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2335)
==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927)
==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111)
==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323)
==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793)
==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712)
==8442== by 0x41350F: main (tst_examples.cpp:227)
==8442== followed by a later acquisition of lock at 0xDF63600
==8442== at 0x4C2911E: QMutex::lock() (in /usr/lib/valgrind/vgpreload_helgrind-amd64-linux.so)
==8442== by 0x7EE5870: QMutexLocker::QMutexLocker(QMutex*) (qmutex.h:102)
==8442== by 0x80086A9: QFactoryLoader::refreshAll() (qfactoryloader.cpp:249)
==8442== by 0x802607E: QCoreApplication::addLibraryPath(QString const&) (qcoreapplication.cpp:2344)
==8442== by 0x6DE792D: QApplicationPrivate::x11_apply_settings() (qapplication_x11.cpp:927)
==8442== by 0x6DE9BAD: qt_set_x11_resources(char const*, char const*, char const*, char const*) (qapplication_x11.cpp:1111)
==8442== by 0x6DF0CB3: qt_init(QApplicationPrivate*, int, _XDisplay*, unsigned long, unsigned long) (qapplication_x11.cpp:2323)
==8442== by 0x6D4EF4D: QApplicationPrivate::construct(_XDisplay*, unsigned long, unsigned long) (qapplication.cpp:793)
==8442== by 0x6D4EABE: QApplication::QApplication(int&, char**, int) (qapplication.cpp:712)
==8442== by 0x41350F: main (tst_examples.cpp:227)a
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
update Russian translations for Qt and tools
Updated Slovenian translations for Qt 4.7
doc: The QML Qt element was missing from the documentation.
64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256
QXmlStreamReader: avoid unnecessary detaching
QSslCertificate: support expiration dates > 2049
Doc: Fixing typo
Doc: Fixing bug involving header misplacement in Creator style
qdoc: Added list of all members (including inherited) page to QML elements.
qdoc: Ensured that text is encoded correctly.
qdoc: Fixed non-well-formed markup.
Doc: Fixed typo in a shortcut string.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Doc: Added more license information.
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix some #ifdefs to compile for a specific combination of featuress that was previously unsupported
update Russian translations for Qt and tools
Updated Slovenian translations for Qt 4.7
doc: The QML Qt element was missing from the documentation.
64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256
QXmlStreamReader: avoid unnecessary detaching
QSslCertificate: support expiration dates > 2049
Doc: Fixing typo
Doc: Fixing bug involving header misplacement in Creator style
qdoc: Added list of all members (including inherited) page to QML elements.
qdoc: Ensured that text is encoded correctly.
qdoc: Fixed non-well-formed markup.
Doc: Fixed typo in a shortcut string.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Doc: Added more license information.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Markus Goetz
Task-number: QTBUG-12259
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (31 commits)
Fix typos in docs
Layout items had the wrong size if the layout was resized to maximum.
Disable minRightBearing optimization in QTextLayout on Mac
Added one test for QRegExp
QMetaObject::normalizeSignature avoid reading past the string in case of invalid signature given.
Fix (implement!) hfw/wfh in QGridLayoutEngine
Fixed a bug in implementation of sizeHint() when there was a constraint
Add text decoration support to QStaticText
Fix QString::arg: When specifying %L1, the group separator would be added even if the local specify QLocale::OmitGroupSeparator
QtDeclarative: get rid of warnings in public header
doc: Clarify documentation of QStaticText
Fix scrollbar randomly popping up in QPlainTextEdit
Remove the definition of QT_HAVE_NEON from qt.prf
Use the fast Neon conversion for converting colors of jpeg images.
Do the conversion from RGB888 to RGB32 using Neon
Move the build of Neon file from painting.pri to gui.pro
QSharedPointer documentation: specify that it is not safe to operate on the same object in different threads
compilation with QT_NO_DEPRECATED
Test we do not have compiler warnings in our headers with more options
QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff
...
|
| | |\ \ \ \ \ \
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
doc/src/examples/simpletreemodel.qdoc
doc/src/examples/spinboxdelegate.qdoc
doc/src/index.qdoc
src/declarative/qml/qdeclarativeimageprovider.cpp
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
invalid signature given.
If passed "a(b", qNormalizeType would return a pointer to the \0 at the end
of the string. We would add \0 to the result (thinking it is ',' or ')' )
And continue to process the memory after the string.
Reviewed-by: Kent Hansen
Task-number: QT-1591
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
even if the local specify QLocale::OmitGroupSeparator
Task-number: QTBUG-9281
Reviewed-by: Denis
|
| | |\ \ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
doc/src/index.qdoc
src/dbus/qdbusconnection.cpp
src/gui/s60framework/qs60mainapplication.cpp
src/gui/s60framework/qs60mainappui.cpp
src/network/access/qnetworkrequest.cpp
src/network/bearer/qnetworkconfiguration.h
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Since we cannot use NEON and VFP concurrently, it is better not to
force neon all over the place :)
Reviewed-by: Andreas Kling
Reviewed-by: Thiago Macieira
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
same object in different threads
Task-number: QTBUG-12700
Reviewed-by: thiago
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Replace the code of the SSE prologue by a macro to avoid copying the
prologue everywhere.
Reviewed-by: Andreas Kling
|
| |\ \ \ \ \ \ \ \
| |_|_|/ / / / /
|/| | | | | / /
| | |_|_|_|/ /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Conflicts:
src/gui/kernel/qt_s60_p.h
src/opengl/qglextensions.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/mediaobject/tst_mediaobject.cpp
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: TrustMe
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The handler for one timer recurses the event loop, and the handler for
another timer removes the first timer, returning from the recursion and
the handler for the first timer causes an invalid write (since the timer
info for the first timer has been deleted).
Fix this by keeping an active reference in QTimerInfo (instead of just a
bool inTimerEvent). If this is non-zero, the timer is currently being
delivered, so we prevent more delivery. When a timer is removed and it's
activateRef is set, we clear it so that the delivery code knows now to
write to memory that's already been freed.
A side effect of this change is that we no longer need to track the
currentTimerInfo "globally" anymore, it can be a normal local variable
in the QTimerInfoList::activateTimers() function.
Task-number: QT-3553
Reviewed-by: olivier
Reviewed-by: joao
|
| |\ \ \ \ \ \ \ |
|
| | | |_|/ / / /
| |/| | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
That code is deprecated for the most part, however under certain
circumstances could be run. The fix is to check the value when using
the deprecated code and change the return value to follow the logic of
the new code.
Task-number: QTBUG-12732
Reviewed-by: João Abecasis
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewer: David Boddie
Task number: QTBUG-11938
|
| | |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | | |
Reviewed by: David Boddie
Task: QTBUG-12313
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Assistant: Include QML docs
Fixed the curve descriptions and added descriptions for overshoot, amplitude, and period. Fix for QTBUG-7940.
Cocoa: Showing a QFontDialog first shows it in the bottom-left corner
Mac: fix regression from 65a673f that makes some buttons unclickable
Fix deadlocks in ICD and NetworkManager engines.
new icons for cell and bt networks.
Doc: updating getting started docs - not finished
Doc: removing empty links in bread crumb
add convience methods for getting ethernet service details.
fix spelling
fix crash
try harder to get cell name
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
amplitude, and period. Fix for QTBUG-7940.
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Add the qt_ prefix to convert_rgb888_to_rgb32_ssse3
Update changes-4.7.0
Use the fast conversion from RGB888 to RGB32 for Jpeg images
Move the SIMD defines to the common declaration of Qt symbols
Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORT
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Use the fast conversion from RGB888 to RGB32 for Jpeg images
Move the SIMD defines to the common declaration of Qt symbols
Fixed: QT_DEPRECATED_WARNINGS defines QT3_SUPPORT
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Move the #defines for the SIMD extension to the common code
in order to be able to use them from any module without copying their
definition.
Reviewed-by: Andreas Kling
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-1043
Reviewed-by: Thorbjorn
|
| |\ \ \ \ \ \ \
| |/ / / / / /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
Removed the unfinished sentence. Fix for QTBUG-10173.
Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173
Unbreak QImage::rgbSwapped() for many image formats.
Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa)
Doc: Adding content to installation guide and fixing printing bugs
Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget
Made changes to qdoc to allow it to accept a "style level" flag
Doc: Correcting bugs in the CSS
Return 'Unknown' bearer type name for unknown bearer type.
Update def files.
Doc: updating index page, x platform and platform spec. Removing redundant style files
Added notice that some links are online documents.
Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed.
Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression)
configure: don't symlink the mkspecs/features directory
Doc: adding changes to getting started and fixing redirection links
doc: Fixed many qdoc errors.
Fixed potential infinite loop in QFileSystemWatcher on Mac.
qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf
Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527.
...
|
| | |/ / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The patch provided by the customer just jumps to reading the next event fom the
kqueue when an unexpected condition happens.
Task-number: QTBUG-12533
Reviewed-by: Bradley T. Hughes
|
| |/ / / / /
| | | | |
| | | | |
| | | | | |
RevBy: Miikka Heikkinen
|
| | | | | |
| | | | |
| | | | |
| | | | | |
QTBUG-11938 and QTBUG-10801
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When compiling for 64-bit with Visual Studio 2008, inline
assembly is not supported. Use intrisic instead.
Reviewed-by: Benjamin Poulain
|
