| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Reviewed-by: Alessandro Portale
|
| |
|
|
|
|
| |
Add detection of CPU extension for SSE3, SSSE3, SSE4.1, SSE4.2 and AVX.
Reviewed-by: Andreas Kling
|
| |
|
|
|
|
|
|
| |
This is (supposedly) more efficient as the compiler can optimise it to a
builtin, per Thiago.
Merge-request: 2430
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
|
| |\
| |
| |
| |
| | |
Conflicts:
tests/auto/qtexttable/tst_qtexttable.cpp
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-12063
Reviewed-by: trustme
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits)
fix macx not having UNICODE in DEFINES any more
doc: Fixed several qdoc warnings.
Fix an Assert in QTextTable
doc: Fixed several qdoc warnings.
QSslSocket: Improve error handling
qdoc: Fixed several <div> elements that had the "/>" ending.
QSslSocket: fix documentation for QSslSocket::setPeerVerifyMode()
qdoc: Fixed breadcrumbs for QML examples.
remove redundand translations project files
make projects lupdate-friendly
Timing fix for slow devices.
QNAM: Add future enum attribute for Zerocopy QNAM
fixed built-in jpeg and tiff in configure.exe, QTBUG-12093
fix indentation
fix build for -no-qt3support
Compile fix for bearermonitor example
Doc: Cleaning style and adding support for Creator
Add NTLMv2 authentication support to QAuthenticator.
QIODPLB: Sync behavior of ungetBlock() and ungetChar()
QFileIconProvider: Load icons on demand.
...
|
| | | | |
|
| | | | |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge branch '4.7-upstream' into 4.7
Conflicts:
doc/src/declarative/advtutorial.qdoc
src/declarative/graphicsitems/qdeclarativeloader.cpp
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits)
Doc: Cleaning style and adding support for Creator
Add NTLMv2 authentication support to QAuthenticator.
QIODPLB: Sync behavior of ungetBlock() and ungetChar()
QFileIconProvider: Load icons on demand.
Doc: fixing offline style
Fix handling of SSL certificates with wildcard domain names
Doc: fixing examples link
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
SSL library loading: load system libs only once
Revert "SSL backend: load libraries for certificates only once"
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
Doc: Adding support for Qt Creator style
doc: Fixed last of the declarative/QML qdoc warnings.
qdoc: Marked some missing declarative properties and functions as \internal.
qhelpgenerator: Fix namespace syntax checking.
...
|
| | | | |\ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits)
Doc: Cleaning style and adding support for Creator
Add NTLMv2 authentication support to QAuthenticator.
QIODPLB: Sync behavior of ungetBlock() and ungetChar()
QFileIconProvider: Load icons on demand.
Doc: fixing offline style
Fix handling of SSL certificates with wildcard domain names
Doc: fixing examples link
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
SSL library loading: load system libs only once
Revert "SSL backend: load libraries for certificates only once"
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
doc: Fixed several qdoc warnings.
Doc: Adding support for Qt Creator style
doc: Fixed last of the declarative/QML qdoc warnings.
qdoc: Marked some missing declarative properties and functions as \internal.
qhelpgenerator: Fix namespace syntax checking.
...
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
ungetChar() supports ungetting data that didn't originate from the
QIODevicePrivateLinearBuffer, so ungetBlock() should too.
|
| | | | | | | |
|
| | | | | | | |
|
| |\ \ \ \ \ \
| |/ / / / /
|/| | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
bin/syncqt
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp
src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/page/FrameView.h
src/3rdparty/webkit/WebCore/platform/ScrollView.cpp
src/3rdparty/webkit/WebCore/platform/ScrollView.h
src/corelib/plugin/quuid.cpp
src/gui/dialogs/qfontdialog.cpp
src/multimedia/audio/qaudiodevicefactory.cpp
src/opengl/qgl.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/qxmlquery/tst_qxmlquery.cpp
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
QThreadStorage is not available when bootstrapping qmake, so fall back
to a simple static bool instead.
Reviewed-by: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
qrand() has seeded with a default value of 1 for quite a long time, and
is checked by the test mentioned above. The previous commit to change
the default seed value must be reverted to keep compatibility.
Change qrand() and qsrand() back to the way they were in 4.5. This fixes
the qrand() regression.
Change QUuid::createUuid() to seed exactly once per thread, which is a
change from 4.5, where QUuid would see only once per application. This
solves the original bug, QTBUG-3543, where multiple threads would
generate the same UUID sequences. This also fixes the regression
reported in QTBUG-11213, where seeding did not happen in certain cases.
Reviewed-by: Prasanth Ullattil
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We used to delete the tracked object before the new tracking was
properly set up in QSharedPointer. That means if the tracked object's
destructor or deletion function recursed into the QSharedPointer, it
would find itself in an inconsistent state.
So instead finish the setup and only then call out to user code. That
ensures the internal state is always valid.
Task-number: QTBUG-11730
Reviewed-by: ossi
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Prasanth Ullattil
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Re-add the stdlib.h include, since it brings in RAND_MAX
Reviewed-by: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
An unintended side-effect of commit
90a082c9076f35dcca092ade019891e92692710e is that if qrand() is used
without being seeded first, then createUuid() would always generate the
same sequence. This quite likely to happen considering the Qt does not
actually seed the PRNG, but does use it in many places (we do not call
qsrand(), but we do often call qrand()).
Fix this by changing qrand() to calculate a seed, instead of defaulting to
1. This allows us to remove the qsrand() overload with no arguments, since
qrand() will now seed automatically unless manually seeded by the programmer.
Task-number: QTBUG-11213
Reviewed-by: thiago
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
8601-2004 standard."
This reverts commit 752d46c90ee0fc5f06f01feedd8e0659178b15d4.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
8601-2004 standard.
Task-number: QTBUG-11623
Reviewed-by: Denis Dzyubenko
Reviewed-by: David Boddie
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
parsing failed.
It's relevant with QTBUG-11623, but not a fix for it.
Reviewed-by: Aleksandar Sasha Babic
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 1e91d6b79cba488fa5c6f7d954de611903837f76.
Should not be necessary anymore after 61daa2f41969688.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This reverts commit 0b56799601690a747c42dfbbefe95f18e837eb3f.
Should not be necessary anymore after 61daa2f41969688.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
I haven't seen the bug happening in practice, but I decided to be
safe rather than sorry.
The rationale is that if a network request comes in, the select
thread will signal the active object in the main thread, remove the
socket from the set of monitored sockets, and then go to sleep in the
waitCond.wait() call, waiting for reactivation by the
QSelectMutexGrabber. However, in
QEventDispatcherSymbian::socketFired(), if the event causes the
socket to be deleted, reactivateSocketNotifier will never be called,
and therefore the wait condition will never be terminated.
Fixed by only entering the wait condition if a grabber has already
written to the pipe, signalling that it wants the lock.
AutoTest: Passed
RevBy: Markus Goetz
|
| | |_|_|_|/
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The problem happened because of a race condition in the way Qt
cancelled the select call from Open C. Under high network loads, a
network request could come in, causing the select call to end.
Afterwards, the pipe normally used to cancel the select call would
be emptied (although it was already empty). If a context switch
happened after the pipe was emptied, but before the lock was released
in waitCond.wait(), the main thread could try to grab the lock and
write to the pipe because it was unsuccessful. This would in turn
cause the next call to select to terminate immediately, and without
work to do, the select thread would go straight down to
waitCond.wait() and get stuck there.
Fixed by moving the pipe draining loop from the select thread to the
main thread, right after the lock grab. This guarantees that the
select thread is empty when returning to the select call.
Task: QT-3358
AutoTest: Passed
RevBy: Markus Goetz
|
| | |/ / /
|/| | |
| | | |
| | | |
| | | | |
Task: QT-3358
RevBy: Markus Goetz
|
| |\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Linux runonphone - tell the user which driver to load
Fix USB serial port detection of the Nokia N95 on linux
Fix license headers on new files imported from Qt Creator
Implement just in time debug feature for runonphone
Merge tools/runonphone/symbianutils from qtcreator src/shared/symbianutils
Add exception barrier to QCertificateRetriever::RunL()
Set QThreads to be process critical automatically on Symbian OS
|
| | | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
On Symbian OS, a thread is non critical by default - this means if it
crashes the process does not automatically terminate, rather it is
allowed to handle the crash by itself. Only the main thread is critical
by default.
Since this is not the behaviour on other platforms, application developers
are unlikely to have considered this case - and would need to write
symbian specific code to catch the crash.
For such advanced users, they can reset the critical flag on the thread
once they get control in QThread::run().
By default, a crash in any thread created via the QThread API will now
crash the process.
Reviewed-by: Iain
|
| |/ /
| |
| |
| |
| | |
Merge-request: 725
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
this function enables starting subprocesses which need command lines
which cannot be constructed via the portable list-based api. such cases
would be programs which need quoting rules which diverge from the msvc
runtime.
Reviewed-by: joerg
Task-number: QTBUG-7620 (and various others which boil down to that)
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-230, QTBUG-5866
Reviewed-by: joerg
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
8601-2004 standard.
Task-number: QTBUG-11623
Reviewed-by: Denis Dzyubenko
Reviewed-by: David Boddie
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Consolidate zlib configuration redundancy
Fixed whitespace formatting
Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
Split image handler plugin project files
No explicit link to zlib/jpeg for system mng/tiff
Removed stray line continuations
Long live else!
qdoc: Added a solution for creating tables of contents for manuals.
Doc: Fixed markup.
Fixed size hint for combo box on windows
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Consolidate zlib configuration redundancy
Fixed whitespace formatting
Fix incomplete support for built-in jpeg, mng, tiff and gif handlers
Split image handler plugin project files
No explicit link to zlib/jpeg for system mng/tiff
Removed stray line continuations
Long live else!
qdoc: Added a solution for creating tables of contents for manuals.
Doc: Fixed markup.
Fixed size hint for combo box on windows
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Hide some more files from git-status.
Fixed Qt symbian/linux-armcc mkspec when configured with -qtlibinfix.
Fixed symbian/linux-armcc mkspec when configured with -qtlibinfix.
Fixed deployment locations for various profiles.
Added a top-level runonphone target for Qt and QtWebKit.
QS60Style: Simplify QMenu drawing
QS60Style: Remove gap from QProgressDialog
ColorDialog is incorrectly positioned
Support for "deploy" make target in Symbian
qtguiu.def merge conflict fix
Fix for include "private/qt_s60_p.h" in non-symbian builds
Making orbit input methods work with Qt apps with -no-s60
Using the remaining valid data to construct the QTime object when msec parsing failed.
QProgressDialog text is too close to dialog border
fix for broken input method loading
Avkon Removal DEF file updates
Stub version of QS60Style
Avkon removal configured with -no-s60
QFileDialog broken in landscape in N8
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task: QTBUG-11396
RevBy: Miikka Heikkinen
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | |
| | | | |
Conflicts fixed:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
parsing failed.
It's relevant with QTBUG-11623, but not a fix for it.
Reviewed-by: Aleksandar Sasha Babic
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Avkon dependencies can be configured out with the -no-s60 configure
flag, conversely Qt on Symbian will use Avkon if -s60 is configured.
These changes are intended to keep or introduce binary compatibility
between the s60 and no-s60 configurations. To do this, it has been
necessary to introduce stub equivalents of the CAknAppUi related
classes into the no-s60 configuration, and override all Avkon framework
virtual functions in the QS60Main... classes.
Other than that, these changes are mostly just correcting the use of
the Q_WS_S60 flag so that it only refers to Avkon dependencies.
Reviewed-by: Sami Merila
|
| | |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem was that there was a misalignment coming from the d&d code.
That called in the end our SSE optimized functions.
This code turns out to be calling QApplication::processEvents which
in the the calls the Qt event dispatcher for windows' processEvents
function. This function will now also always align the stack to 16
bytes and be SSE ready.
Task-number: QTBUG-11880
Reviewed-by: Zeno Albisser
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-1853
Reviewed-by: Thiago
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Each template argument need to be normalized separately. Else, the const
type of one argument may end up moved in the first argument.
(And then the compilation of the generated moc file would fail as the types
would not match)
Reviewed-by: Kent Hansen
Task-number: QTBUG-11647
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Thierry
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The slowdown factor is useful for debugging complex animations.
Setting it to 0 will stop all animations when slowMode is enabled.
Submitted-by: Lasse
Reviewed-by: Thierry
|
