| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QObject internals have changed, and the mutex that need to be locked
to access the senders list is not the same anymore, and not accessible
form qstatemachine.cpp
But we do not need to loop over the senders list anyway because this is
done in sender()
We also do not need to lock in order to access the currentSender
Reviewed-by: Eskil
|
| |
| |
| |
| | |
Reviewed-by: Tom
|
| |
| |
| |
| |
| | |
Reviewed-by: Olivier Goffart
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/382
|
| |
| |
| |
| |
| | |
used character operations whenever possible
better usage of QLatin1String
|
| |
| |
| |
| |
| |
| |
| | |
Also fix an issue in QTreeView where a signal could be connected
several times
Reviewed-by: Thierry
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Lars
|
| |
| |
| |
| |
| |
| | |
If unixodbc detection fails, try and link/detect iodbc libraries and link against them.
Reviewed-by: Lincoln Ramsay
|
|\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This was already fix. But there was still a frame if there was a
stylesheet on the applicaiton.
The reason is that the frame's constructor call the style for some
hints. And later the combobox will query the style again for the frame
hint, before the view get polished.
The problem is that the StyleSheetStyle will fill the css cache with
wrong information on the first call.
This is not visible if there is no stylesheet as in the constructor, the
widget style is still the default application stylesheet if there is no
global applicaiton stylesheet.
Task-number: 254589
Reviewed-by: jbache
BT:
|
| |
| |
| |
| |
| |
| |
| |
| | |
...but just silently return. This is ok because at another location
in QNetworkReplyImplPrivate we do the same.
Reviewed-by: Thiago
Task-number: 254638
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We now set and unset the GTK_HAS_FOCUS flag on the same
painting call only if focus is set instead of resetting it
on each painting call. This is a tiny optimization but also kills
a possible assert on certain versions of Gtk+ (as reported with
Red Hat Enterprise Linux 5).
Task-number: 254614
Reviewed-by: denis
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Thomas Sondergaard (2):
Danish translations
Updated danish translations. Added them to relevant project files.
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/549
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | | |
Removed unused line and added task number to autotest.
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
diaulas (1):
Dont show children when parent is not visible in QGraphicsItem
Request-url: http://qt.gitorious.org/qt/qt/merge_requests/407
Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When setVisible() is called on a QGraphicsItem, if the parent of that
item was hidden, the child shouldn't be actually shown.
Task-number: 197802
Reviewed-by: leo
Reviewed-by: alexis
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use a union instead of an unsafe cast when swapping the bytes in
the QDataStream streaming operators. The old seems to cause problems
with Link Time Code Generation optimizations with the MSVC compilers.
Task-number: 247708
Reviewed-by: Samuel
Reviewed-by: Thiago
BT: yes
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem was that we don't clear the selection model if the previous
selection was valid.
Task-number:251341
Reviewed-by:jasplin
|
| |\ \ |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: kh
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We should use the "statusbar" string when we draw the sizegrip.
Since gtkstatusbar is the only gtk widget using the paint_resize_grip
and it uses the "statusbar" string itself it should be safe to
assume this.
Task-number: 254535
Reviewed-by: rosch
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: 254365
Reviewed-by: Peter Hartmann
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reworked the 85f98acaa3a38079071bea711e43c9a86edec1f6 fix, since
it broke glyph positioning in the GL engine under Windows.
Instead of changing the glyph cache margin, which impacts where
the glyph is positioned, we just make the image the glyph is drawn
into 4 pixels bigger in width/heigth.
The margin in QImageTextureGlyphCache needs to be reworked..
Task-number: 254450
Reviewed-by: Eskil
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Correcting invalid padding values. none is not a valid padding value.
Rev-by: David Boddie
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Note that two digit years are always in the year 19xx
This is excepted for compatibility reason as discussed with Peter
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
That was a bug in the exemple.
Reviewed-by: Kavindra Palaraja
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Seems like no code was written to handle other font engines than
CoreText. Unfortunatly the engine on Carbon is ATSUI. This patch
adds general code for converting a QFont to an NSFont so the dialog
can support other engines than CoreText
Task-number: 251957
Reviewed-by: Trenton Schulz
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Adding docs to toHtml() and toPlainText()
Task-number: 253088
Rev-by: Ariya Hidayat
Rev-by: David Boddie
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When creating a UI based on double types we only assigned the
control pointer in certain cases. This would crash because the
tooltip did not check for the pointer, but the real issue was that
we didnt assign the control in the first place.
Task-number: 249710
Reviewed-by: Richard Moe Gustavsen
|