| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
scaled/translated matrix
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
| |
| |
| |
| | |
textChanged signal.
|
| |
| |
| |
| | |
from the open bracket upto the close bracket.
|
| |\
| | |
| | |
| | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | |
|
| | | |
|
| | |\
| | | |
| | | |
| | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |\ \
| | | | |
| | | | |
| | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | | |
We will need to optimize the pixmap.toImage calls.
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Switch QFxPixmap to use QPixmapCache, not own partial QImage cache.
OpenGL prefers QImage for optimization, but that optimization is only
partially preserved (QFxPixmap deals ONLY with QPixmap now).
Opaque QFxPixmap no longer available.
|
| |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
kinetic-declarativeui
Conflicts:
tools/qdoc3/doc.cpp
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix what looks like the result of a `git merge' gone wrong.
|
| | |\ \ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Fix obvious typo: frosmUtf16 -> fromUtf16
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Leo
|
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This improves performance on embedded.
Reviewed-by: Samuel
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Make sure the correct texture unit is active when copying from the
pixmap to the FBO in begin().
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
operator+() easier.
This adds a few explicit QString(...) casts around operator+()
based expressions to make them acceptable for QCOMPARE.
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Brad Hards (2):
Remove duplicate qpdf_p.h include.
Fix build when compiling Qt using -no-opengl configuration.
Request-url: http://gitorious.org/qt/qt/merge_requests/548
Reviewed-by: Norwegian Rock Cat <qt-info@nokia.com>
|
| | | | | | | | |
|
| | | | | | | | |
|
| | | | | | | | |
|
| | |/ / / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Splitted text in the AboutQt dialog into several chunks to make use of
advanced qmessagebox text fields
Reviewed-By: Trenton Schulz
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
removed declaration of properties that are already declared in Qt
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
These changes were added to qdoc in the days when we thought we
might switch to doxygen. Now we have taken the approach of making
qdoc output be more doxygen-like, so this ifdefed code is now dead.
|
| | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/embedded/qkbdtty_qws.cpp
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Instead, query the mode at startup, store it and restore it on exit.
Reviewed-By: TrustMe
Task-number: 254194
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
When a form is loaded, Designer will set the path to the resource as
an absolute path rather than the path actually stored in the file. There
is code to work around this to make file paths relative when saving the
file later on, but no work around for Qt Jambi. So when saving Qt Jambi
forms, you would get an absolute path to the resource which contains the
location of the resource file (.jar or on disk) This of course breaks
the concept of resources, as the .jui file was no longer portable. The
fix is to special case Qt Jambi resources and set the relative path
when loading them.
The patch has no effect on regular Designer.
Task-number: 254621
Reviewed-by: Kai Koehne
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Additionally we turn -ltcg on by default on Windows CE.
See commit 56191830 for details.
Reviewed-by: mauricek
BT: yes
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Make use of setInformativeText in qmessagebox for aboutQt dialog for
now. Proper fix might be to add scrollable widget to the dialog, or
split the about info into several pieces, though it cannot be done in a
patch release.
Task-number: 254464
Reviewed-by: Trenton Schulz
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Even if the source pixels are opaque we have to enable blending for the
non-trivial composition modes. Some of the composition modes are
independent of source alpha and depend on destination alpha for example.
Reviewed-by: Tom
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: TrustMe
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QString objects from smaller chunks.
The QStringBuilder class:
QStringBuilder uses expression templates (using the '%' operator)
to postpone any actual concatenation until it is assigned to an
actual QString. At that time it knows the exact sizes of all chunks,
can compute the required space, allocates once a QString of
appriopriate size and then copies over the chunk data one-by-one.
In addition, QLatin1Literal is a drop-in replacement for QLatin1String
(which we can't change for compatibility reasons) that knows its
size, therefore saving a few cycles when computing the size of the
resulting string.
Some further saved cycles stem from inlining and reduced reference
counting logic (the QString created from a QStringBuilder has typically
ref count equal to 1, while QString::append() needs an extra test)
Minor changes to the existing QString class:
- Introduce QString constructor to create an uninitialized QString of a given size.
This particular constructor is used by QStringBuilder class.
- Introduce a QT_USE_FAST_CONCATENATION macro to disable the existing
overloads of operator+() and helps finding the places where they are used in code.
- Introduce QT_USE_FAST_OPERATOR_PLUS. This also disables the existing
overloads of operator+() and creates a new templated operator+() with
identical implementation of operator%(). This allows code that is compilable
QT_CAST_{TO,FROM}_ASCII to use QStringBuilder almost transparently. The only
case that is not covered is creating objects like QUrl that are implicitly
constructible from a QString from a QStringBuilder result. This needs to be
converted explicitly to a QString first, e.g. by using QUrl
url(QString(QLatin1String("http://") + hostName));
Reviewed-by: MariusSO
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-By: TrustMe
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
EGL has window surfaces which are bound to a particular window ID. When
that window ID changes, the EGL surface must be re-created. This is
achieved by sending the QGLWidget a ParentChanged event.
Reviewed-By: Trond
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-By: TrustMe
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-By: TrustMe
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Qt::ScrollBarAlwaysOn
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/432
Reviewed-by: Olivier Goffart
Reviewed-by: Thierry
|