| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| |
| |
| | |
...because it was never implemented. This patch does that.
Task-number: 255377
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
This was a contribution sent via the public bugs channel.
Task-number: 255161
Reviewed-by: Marius Storm-Olsen
|
| |
| |
| |
| |
| |
| |
| |
| | |
If OBJECTS_DIR was empty then it would create a directory for the
manifest files in the root directory. This is not desired as it should
create a directory in the build directory instead.
Reviewed-by: Marius Storm-Olsen
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| | |
in practice, this matters only for backslashed line continuations
Task-number: 255336
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We didn't actually check the depth of the target window before
calling the qt_x11_drawImage() fu, that will only work with
depths >= 24.
Task-number: 255311
Reviewed-by: Samuel
BT: yes
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
events."
This reverts commit 7314c07a3e443b1d5349b419a03db8d41ca43f7e.
As reported by Eike, this patch caused several problems for Qt Creator.
Potentially it may cause problems for other (external) applications as well.
An alternative fix (scheduled for 4.5.x) needs to be found for tasks
254456 and 254460.
Reviewed-by: Richard Moe Gustavsen
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The reason is that cocoa looses the first responder when
we raise the fake window inside the MDA area. So we need
to re-set the first responder again
Task-number: 255040
Reviewed-by: Trenton Schulz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
There were several problems with antialiased text in 16 bit mode
under Windows. No gamma correction was done, yet we prepared the
cached glyphs for gamma correction. The mask format we rendered
the glyphs into was also set to the desktop depth, which implied
that information was lost and the text looked rather odd.
Reviewed-by: Samuel
BT: yes
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some of the tests (including the httpsServer one) requested that the
server close the connection (Connection: close). It could happen that,
well, the server did close the connection and we noticed it while doing
the waitForBytesWritten in the doSocketFlush function. Then we'd create
an error in the next step because the socket wasn't connected.
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: mariusSO
|
| | |
|
| |
| |
| |
| |
| |
| | |
We need to set alpha to the right value when copying pixmaps.
Reviewed-by: Donald <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| | |
This is covered by the autotest
tst_QTextDocument::receiveCursorPositionChangedAfterContentsChange()
Reviewed-by: con
|
| |
| |
| |
| |
| | |
cursorPositionChanged() singals of QTextDocument. The contentChange() signal
is used for the syntax highlighter.
|
| |
| |
| |
| |
| |
| |
| | |
More information in task 166873.
Merge-request: 514
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Some checks where in the wrong locations, and some endifs where
hard to read.
Merge-request: 611
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
| | |
|
| |
| |
| |
| |
| | |
Reduces the number of qmalloc calls by 9% and reduces the instruction
count as reported by valgrind by 2% in a release build.
|
| |
| |
| |
| |
| | |
Fixes the no qconfig.h output issue in main
Reviewed by: trustme
|
| |
| |
| |
| | |
Needed due to commit 4acabb3abd0ff109b9abeedb6832f5b1c3e0cc4e
|
| |
| |
| |
| |
| |
| | |
Also, issue a warning if a type is not known to the meta-type system.
Task-number: 248129
|
| |
| |
| |
| |
| |
| |
| | |
Converting the array to its string representation is not very useful.
Now round-trip conversion will work as well.
Reviewed-by: Ariya Hidayat
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The fix that was introduced adds regressions, and I don't see a way we
can fix it without breaking someone elses code. So restoring the
original fix that just avoid a crash (autotest by Thierry is included).
Revert "Revert Avoid a crash when setting a focus in a widget
hierarchy containing"
Revert "Setting a focus on a widget hierarchy which contains both
visible and invisible widgets could cause a crash."
This reverts commit be833a4f25a8ec8c3dd7a8ac4fa4b0507c93e7ee.
This partially reverts commit 1a7da7096bbda17197738061902f4489af234bc0
Reviewed-by: Thierry Bastian
Reviewed-by: Prasanth Ullattil
|
| |
| |
| |
| | |
Reviewed-by: trustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
added new method QNetworkAccessManager::deleteResource (naming the
method "delete" was not possible since it is a reserverd word in
C++) and adjusted all the internals necessary.
Task-number: 242916
Reviewed-by: Thiago
|
| |
| |
| |
| | |
Reviewed-by: Joerg
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The check for cleartype in qt_win_read_cleartype_settings() was not
correct for Windows Mobile
For anti-aliased text rendering we also have to use another
pixel format for the native image.
Task-number: 249642
Reviewed-by: mauricek
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We've had a problem with a stale cache for color profiles this should
make things work well. We get the callback for each display whether it
needs it or not, but honesly I would rather that we update this a few
times too many when people change their display profile than not at all.
FWIW, this code is inspired from Apple's Tech Note TN2035.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When cross-compiling, it's possible that the size of qreal for moc
itself (host platform) is different from the size of qreal on the target
platform. Thus, we should not encode the metatype-id of qreal at moc
time. Instead, use QMetaType::QReal in the generated code so that the
the property flags are only derived at compile time.
We also need to support the pesky QT_COORD_TYPE. In this case, qreal can
be _any_ type (not just float or double), so we encode the property type
as 0 and have a special check in QMetaProperty::type() that resolves the
correct type at runtime.
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
What could happen starting with 4.4 is that you could move a toolbar.
If you then added actions, the toolbar would grom and make the other
toolbars move to the right although it had enough space already to show
the newly created actions.
Autotest will follow shortly.
Task-number: 226060
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| |
| | |
So far, only operator% was working for concatenation in those circumnstances.
Now, defining QT_USE_FAST_OPERATOR_PLUS and QT_USE_FAST_CONCATENATION is
enough, so user code will work without any source changes.
Reviewed-by: joao
|
| |
| |
| |
| |
| | |
Merge-request: 395
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
| |
| |
| |
| |
| | |
Merge-request: 384
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
An alternative solution is to swap the order of
-I../../include and -I../../include/QtOpenGL when
compiling the opengl module.
Reviewed-by: TrustMe
|