| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
doc/src/declarative/tutorial2.qdoc
doc/src/declarative/tutorial3.qdoc
src/declarative/graphicsitems/qmlgraphicsmousearea.cpp
src/multimedia/playback/qmediaplayer.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
operator+=() and co. would first detach, and then realloc if they found
the reservation too small. in particular, appending anything to an empty
list would trigger this double reallocation (first copy shared_null,
then grow the copy).
entirely rewritten take 3, this time without memory corruption or
exhaustion ... :)
Reviewed-by: joao
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
we already know that we are dealing with a movable type, so it is safe
to keep a temporary copy of the raw data instead of going through the
copy c'tor.
this way we save a pretty useless ref()/deref() pair for each and every
insertion of an implicitly shared type into a QList.
the QtPodForSize class is somewhat ugly. we should use QIntegerForSize,
but that's not possible without having separate template
specializations, which is not possible without some bigger changes to
the qt type info system. it will be beautified in due time. :)
Reviewed-by: joao
|
| | |
| |
| |
| |
| |
| | |
it's not the task of the container class to do so.
Reviewed-by: joao
|
| | |
| |
| |
| |
| |
| |
| |
| | |
append2(list) didn't use the array shifting logic the append() for
single elements does. this would cause the list to grow endlessly
despite leading elements being removed if only lists were ever appended.
Reviewed-by: joao
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
a list to which we append after we took something from the beginning
is most likely a queue, and it seems unlikely that we would suddenly
start prepending to it. consequently, optimizing the prepending case
by leaving the first third of the allocation free just increases the
number of times the array needs to be shifted down.
Reviewed-by: joao
|
| | |
| |
| |
| | |
Reviewed-by: joao
|
| |/
|
|
|
|
|
| |
This overloaded function can be used to replace a specific portion
of a QByteArray with an arbitary amount of characters from a char[].
Reviewed-by: Markus Goetz
|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (25 commits)
Add convenience function QTextCursor::positionInBlock()
Fixed URL in Russian translation.
Designer/Resourceview: Suppress warning about QFileInfo on empty path.
optimize qstring::simplified()
Revert optimizations to QString::append
unbreak QList::append() and co. again
Implement bookmark manager widget.
optimization: use QList::reserve() and QVector::reserve()
amend "purge msvc.net and msvc2002 makespecs"
Added QPlainTextEditor::anchorAt(const QPoint &pos)
Fix memmory leak.
Fix spacing.
Prevent renaming the bookmarks menu root item, it's just a placeholder.
Fix broken set last shown pagen when the last page was about:blank.
Move launch with external app in base class.
Make sure the bookmarks menu updates on add/ remove as well.
Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
...
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
optimize qstring::simplified()
Revert optimizations to QString::append
unbreak QList::append() and co. again
Implement bookmark manager widget.
optimization: use QList::reserve() and QVector::reserve()
amend "purge msvc.net and msvc2002 makespecs"
Added QPlainTextEditor::anchorAt(const QPoint &pos)
Fix memmory leak.
Fix spacing.
Prevent renaming the bookmarks menu root item, it's just a placeholder.
Fix broken set last shown pagen when the last page was about:blank.
Move launch with external app in base class.
Make sure the bookmarks menu updates on add/ remove as well.
Fix broken Drag&Drop, reset and clear the model if we set new bookmarks.
avoid double reallocations in appending operations
avoid double reallocation in string-growing replace() case
optimize qHash() some more
optimize QList::mid()
optimization: use QList::reserve() in QSet::toList()
add QList::reserve()
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
- avoid detaching if the string is already simplified
- avoid calling isSpace() multiple times on the same character
Reviewed-by: joao
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 03ac778172b783d26bb1c7c5d92bdedd045fcc92 and
commit 02135be18f3c4b1d1525aff6dfe96c9c8521084d. They broke qt
on all platforms (e.g. qmake didn't compile on Windows any more).
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
make sure that the detached object is always at least as big as the
original one. that may be somewhat wasteful, but it is no worse than
before the detach() optimization. one may consider improvements later.
Reviewed-by: joao
|
| | | | |
| | | |
| | | |
| | | | |
Co-authored-by: denis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
operator+=() and co. would first detach, and then realloc if they found
the reservation too small. in particular, appending anything to an empty
list would trigger this double reallocation (first copy shared_null,
then grow the copy).
Reviewed-by: joao
Reviewed-by: denis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
detach() followed by resize() is suboptimal, as it first creates an
identically sized copy, and then a differently sized one.
Reviewed-by: joao
Reviewed-by: denis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
on modern architectures, a longer data dependency chain is worse than a
slightly bigger instruction.
as it happens, the code is also clearer. would you have guessed that
qHash() is only 28 bits wide?
Reviewed-by: joao
Reviewed-by: denis
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
instead of append()ing each element separately, reserve enough space and
do a low-level node copy.
obviously, the gain for small simple types is the biggest.
Reviewed-by: joao
Reviewed-by: denis
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Denis
Reviewed-by: Joao
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
while this reserves memory "only" for the pointer list, this still
amounts to 100% of the re-allocs for small simple types. for
big/complex/static types the gain is lower, but still.
Reviewed-by: Denis
Reviewed-by: Joao
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QString::fromUtf16() is slow - it does a BOM check and optionally byte
swapping, which is utterly irrelevant when converting internal data
structures which are raw utf16 in host byte order. so replace it with
QString::fromUnicode() where possible (which seems to be everywhere).
the reasoning is the same as in commit e0fda52f, so not getting further
reviews.
Reviewed-by: denis
Reviewed-by: joao
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
to complement the QString(const QChar *, int) one, which unfortunately
clamps sizes below zero to zero instead of computing the length itself
instead.
Reviewed-by: denis
Reviewed-by: joao
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/linux-g++-x11egl/qplatformdefs.h
src/declarative/qml/qmldom.h
src/declarative/util/qmlview.cpp
src/declarative/util/qmlview.h
tools/qdoc3/cppcodemarker.cpp
tools/qmldebugger/standalone/canvasframerate.cpp
tools/qmldebugger/standalone/engine.cpp
tools/qmldebugger/standalone/expressionquerywidget.cpp
tools/qmldebugger/standalone/expressionquerywidget.h
tools/qmldebugger/standalone/objectpropertiesview.cpp
tools/qmldebugger/standalone/objectpropertiesview.h
tools/qmldebugger/standalone/objecttree.cpp
tools/qmldebugger/standalone/qmldebugger.cpp
tools/qmldebugger/standalone/watchtable.cpp
tools/qmldebugger/standalone/watchtable.h
|
| | | |/
| |/| |
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: (22 commits)
use egl properties when creating surfaces on symbian
work around the current include file structure on Symbian^3
Get rid of the dependency on the Symbian app layer
Fix incorrect license headers
Fix incorrect license headers
Supressed Icon sizes on QPushButton in QS60Style
Fixed libstdcpp.dll version autodetection for Symbian
Fixed linkage failure when building qmake on Unix platforms
Factored epocRoot implementation out of qmake
Factored readRegistryKey implementation out of qmake
ColorDialog is always shown as stripped-down version (for QVGA)
Virtual keyboard can't be closed anymore after tapping the text area
Revert "Factored readRegistryKey implementation out of qmake"
Revert "Factored epocRoot implementation out of qmake"
Pass QAudioDeviceInfo when creating audio input/output in examples
Symbian backend for QtMultimedia audio
Modified configure to detect SDK support for Symbian audio backend
Added implementation of epocRoot() function to configure
Removed duplicated implementation of readRegistryKeys from configure
Factored epocRoot implementation out of qmake
...
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Pass QAudioDeviceInfo when creating audio input/output in examples
Symbian backend for QtMultimedia audio
Modified configure to detect SDK support for Symbian audio backend
Added implementation of epocRoot() function to configure
Removed duplicated implementation of readRegistryKeys from configure
Factored epocRoot implementation out of qmake
Factored readRegistryKey implementation out of qmake
QWebView scrolling doesn't clear old elements before painting again
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Exposing epocRoot() to the configure application allows it to
determine the location of the currently active Symbian SDK, so that
support for optional SDK features can be checked.
Reviewed-by: Miikka Heikkinen
|
| | |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Commit f21d183 introduced a GetMessage hook that would try to post
a message to the Windows queue if the hook received an event that was
not the WM_QT_SENDPOSTEDEVENTS message.
However, the logic used is flawed, and would never post the message
unless we received a message for a window that was not the event
dispatcher's internal window. Timer messages DO go to the internal
window, and the last handled timer message SHOULD trigger the hook
to post a new WM_QT_SENDPOSTEDEVENTS, but due to the flawed logic, it
would not.
The most notable side effect of this bug is that regular repaints and
animations would not become visible unless the user moved the mouse
or used the keyboard.
Task-number: QTBUG-7728
Reviewed-by: Andreas Aardal Hanssen
Fix verified by 2 users in the Jira report mentioned above.
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | | |
Conflicts:
tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Always set channel.reply to 0 when done
Revert "Added note to make QList destructor virtual in version 5"
Fix s390(x) atomic ops related crashes
Fix undefined sequence point compiler warning
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Virtual functions should not be used with copyable types due to
slicing.
This reverts commit c1db6c2c5a3bbe96a628207af169a032d535426f.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The s390 implementation of the pointer related atomic ops
never worked before, and the memory barrier was mixed up
between the Acquire and the Relaxed variant. This fixes
both.
Merge-request: 2312
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | | |
Conflicts:
src/corelib/codecs/qtextcodec.h
|
| | |/ / /
| | | |
| | | |
| | | | |
Reviewed-by: Shane Kearns
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-By: Trust Me
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-By: Bradley T. Hughes
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | | |
Conflicts:
src/corelib/codecs/qtextcodec.h
tests/auto/gestures/tst_gestures.cpp
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When a graphicsobject subscribes to a gesture using the
IgnoredGesturesPropagateToParent flag, normal propagation rules do not apply to
the gesture, and instead all gestures of the given type that are started over
the item will propagate to parent items only.
Task-number: QTBUG-7400
Reviewed-by: Andreas
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 455
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The change introduces regression in QIntValidator and QInputDialog, which needs
to be addressed before pushing the change again.
Also reverted the following two compile fixes:
Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)"
Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)"
This reverts commit c786e0cd3c40193073ce2f59f98a4d83bbe1a9b9.
This reverts commit 9e5176070cdeba3e96f1969cfbb71bbd407a651e.
This reverts commit 8911ed8bfe7f918b93c758f9b5d93274b37739e6.
Reviewed-by: trustme
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Trust Me
|
| | |/ / / |
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This allows using QSharedPointer in QHash and QMap keys.
Reviewed-by: Bradley T. Hughes
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-By: Trust Me
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-By: Trust Me
|
