| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix parallel builds
|
| | |
| |
| |
| | |
Reviewed-by: Kai Koehne
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/features/symbian/symbian_building.prf
mkspecs/symbian-gcce/qmake.conf
src/corelib/global/qnamespace.h
src/corelib/global/qnamespace.qdoc
src/plugins/plugins.pro
tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Made Q_ASSERT meaningful again
Introduce new flag for splitview support in Symbian
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
m_bytesPadding is an unsigned integer, assert would never have been
triggered.
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Introduce new flag for splitview support as internal to Qt 4.7.2.
The actual implementation will be delivered to Qt 4.7.3.
Task-number: QTBUG-16572
Reviewed-by: Janne Koskinen
|
| | |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for clipping failure in OpenVG paint engine.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
OpenVG implementation for Broadcom chip has limited scissor rect
count to 32. Because of that Qt OpenVG paint engine fails to clip
correctly if clip rect count exceeds 32. This patch makes Qt
OpenVG paint engine to use mask instead of scissors in such cases.
Task-number: QTBUG-16932
Reviewed-by: Jason Barron
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Use QML notation for documenting TextInput::accepted() signal.
Document the TextInput accepted() signal.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use the name onAccepted() and refer to it as a handler rather than
a signal.
Change-Id: Ibd4144aa809e6d9db136187a07e9a660afa5df1b
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I30a36ba2724c9641e9cfe5ceafa651728907ef63
|
| | |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix inheritance of widget input contexts.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If a parent widget has an input context assigned return that from
QWidget::inputContext() before returning QApplication::inputContext().
Change-Id: I4982a91ace9b7485534f1c31fa4e2d549482640e
Task-number: QTBUG-17390
Reviewed-by: axis
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for ARMV6 drawhelper blending
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Asm code used wrong source register when doing
constant alpha blending.
Task-number: QTBUG-16008
Reviewed-by: TRUSTME
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QStyleSheetStyle: dont crash in PE_WIDGET when widget is null
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Gabriel
Task-number: QTBUG-15910
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This commit put in place a timer based mechanism to ensure that posted
events continue to be sent. As pointed out in commit
eb1015c7bbf135af3656110a4d112377c1209db8, GetQueueStatus() can indicate
that there are messages in the queue but our hook never actually
receives them, hence the timer solution.
However, having the message type and hwnd "guards" in the conditional
for starting a timer would cause us to lose events in some situations,
due to the fact that QEventDispatcherWin32::processEvents() will only
allow one WM_QT_SENDPOSTEDEVENTS message per call (multiple messages
will be compressed into a single one). When racing with other threads,
it would be possible to end up blocking one thread that has pending
posted events unintentionally.
This fix removes the guards and makes sure that we start the keep alive
timer when it's really needed, and only stops it when we really know
that there is nothing left in the Windows message queue.
Task-number: QTBUG-17014
Reviewed-by: joao
Reviewed-by: Marius Storm-Olsen
|
| | |\ \ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Worked around a SC issue in S60 3.x vs 5.0 versions.
Apply the gcce link rules for LIBS_PRIVATE too.
Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task: QTBUG-16578
RevBy: Gareth Stockwell
|
| | |\ \ \ \ \
| | |_|/ / /
| |/| | | /
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't leak ScopeChainNode's
Rename 'plugins\qmldebugging' (work around qmake issues)
Correct the "module not installed" error handling
Flickable uses the flick velocity to determine whether to retain grab
Make addImportPath() work for windows paths starting with lower case
Report any exceptions occurring in WorkerScript javascript code
MouseArea docs - link to onCanceled() from onReleased()
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Create a sub-scope of the global scope chain, rather than a completely new scope
chain. Leaks are difficult to autotest, but an autotest for
QScriptDeclarativeClass::pushCleanContext() was added to ensure its behavior doesn't
regress. To reproduce the leak (prior to this change) use:
while (true) {
QScriptDeclarativeClass::pushCleanContext(&engine);
engine.popContext();
}
Change-Id: I41ac61ea1664da569eb329c8276f2a0bb6d2f1f7
Task-number: QTBUG-17166
Reviewed-by: Martin Jones
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On Windows, qmake places the tcpserver.dll in a 'plugins\qmlreleaseging'
folder, which broke remote debugging of QtDeclarative completely. New name
'qmltooling' while being not so specific, avoids the use of 'debug' in the folder name.
Task-number: QTBUG-17360
Reviewed-by: Martin Jones
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The not installed error will be issued if, after loading plugins and considering
the contents of qmldir, there are no elements in the particular minor version.
For example, if a plugin/qmldir provides the following types (either from C++ or
as QML files specified in the qmldir file):
Foo 1.1
Bar 1.3
importing versions 1.0, 1.2, or 1.4 will fail with the not installed error.
Change-Id: I8566fda6918cb48936144e67a1ce75add0f160d8
Task-number: QTBUG-17324
Reviewed-by: Martin Jones
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Flickable keeps the mouse grab if it was recently flicked and another
flick is started before it has settled. However, it is using the
velocity of the flick rather than the instantaneous velocity of the
view, which causes it to be grabbed unless the view has come to a
complete stop. Use smoothedVelocity which is updated during the view
movement. Also increase the threshold a little.
Change-Id: I970318680d38103468155fa566c489c7874d1b00
Task-number: QTBUG-17383
Reviewed-by: Michael Brasser
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Was causing assert failure on windows if the 'c:' was lower case,
since it was being added to the import path database with a lower
case and thus later lookups with an upper case 'c:' would fail.
This change fixes the check for whether the path refers to a
local path or not.
Task-number: QTBUG-16885
Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877
Reviewed-by: Martin Jones
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-17183
Change-Id: I709cca0bdce247ca9250c4f334654e2ff57b0b32
Reviewed-by: Aaron Kennedy
|
| | | | | | |
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QFileDialog Symbian native file dialog filename filtering.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Now QFileDialog static functions that use Symbian native file dialog
should find the same files as non-native QFileDialog for any given
filename filter.
Task-number: QTBUG-17298
Reviewed-by: Janne Koskinen
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
doc/src/development/qmake-manual.qdoc
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed by our Anttis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Qt::Popup implicitly means Qt::X11BypassWindowManagerHint, and according
to ICCCM 4.1.5 window manager should not move or resize windows that have
override-redirect flag set (i.e. X11BypassWindowManagerHint).
Task-number: QTBUG-11447
Reviewed-by: Olivier Goffart
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Introduced in my previous fix for QTBUG-17257
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Use the Function not implemented error
Reviewed-by: Joao
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The previous mapFromGlobal optimization in
cdd776a91e65bf5c30cea1bab9823134a3f797d0 broke behavior in some window
managers like metacity when resizing by dragging the top-left corner.
Most likely it is a bad behaviour of the window manager (according to
ICCCM 4.1.5 we should get a ConfigureNotify event with x and y in
root coordinates if you consider this is a "movement" of a window).
Reviewed-by: Olivier Goffart
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The code in question was calling XSync and then processing ConfigureNotify
requests, but only using the width/height information from the event,
while ignoring the x,y properties. The code was consuming synthetic
ConfigureNotify with x,y in root coordinate system that we are supposed
to receive from the window manager, which broke mapFromGlobal/mapToGlobal
behavior (after cdd776a91e65bf5c30cea1bab9823134a3f797d0)
Reviewed-by: Olivier Goffart
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Debugger tools (such as valgrind) hooks into QMutex::lock and
QMutex::unlock. So we should continue to call this function if
we want to keep those tools working
Reviewed-by: brad
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
As also mentioned in QTBUG-16692
Reviewed-by: brad
Task-number: QTBUG-17257
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
which does not seem to be used.
Reviewed-by: Brad
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Forgot to delete this file. Since 4.8 we use the
QNetworkReplyDataImpl instead of a QNetworkAccessDataBackend
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also make the authentication cache thread-safe by using
a mutex and making QNetworkAuthenticationCredential
a value-class.
Reviewed-by: thiago
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
It slightly faster, and QThreadData::current is used everywhere
Reviewed-by: mread
Reviewed-by: Joao
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Crashed on OpenBSD.
POSIX.1-2001 says that the behavior if resolved_path is NULL is
implementation-defined. POSIX.1-2008 specifies that the it can
be NULL
Reviewed-By: Markus Goetz
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
We need to release the library in case of errors
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
It seems to be fixed upstream already.
RevBy: Gareth Stockwell
|
| | |\ \ \ \ \ |
|
| | |\ \ \ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
RevBy: Trust me
|
