| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
git://gitorious.org/~fleury/qt/fleury-openbossa-clone into openbossa-fleury-fixes
Conflicts:
src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Create calculateTrunk() and calculateNonTrunk() methods, that
calculate sizes for anchors in different parts of the simplified graph
(using simplex when needed).
Also fixes a minor leak when the nontrunk part is non-feasible. The
old code left the loop leaving the contents of 'sizeHintConstraints'
not allocated.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
After calculations, update the size of all anchors in the simplified
graph. Those updates were happening locally after each calculation
(trunk and semifloats), however some anchors that were not involved in
simplex calculation were missing.
One concrete consequence of the previous behaviour is that semifloat
parts that were simplified into just one anchor, didn't have the chance
to set their sizeAt* values. One consequence of the new behaviour is
one more test passing.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change the functions solvePreferred() and solveExpanding() to take a
list of variables, so they don't need to calculate them based on the
list of constraints. That way, the trunk variables are calculated only
once.
This commit also reduce the scope of 'sizeHintConstraints' variable
instead of clearing and reusing it.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is one good way to track whether simplification is doing all its
job or not. However it can only track cases where the graph simplify
to only one anchor. For more complex cases the graph dumps are the way
to go.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The graph dumper function take a name, and added debug code (that need
to be enabled manually) to generate dumps from the graph before and
after calculation. This is useful to debug simplification.
Signed-off-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
After the addition of expanding SizePolicy, the distribution of sequential
anchors became wrong.
We must now account for three intervals of distribution instead of only two.
This commit also unifies the logic used by the sequential group anchor and
the edge interpolator.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently we do not support negative-sized anchors in the graph,
instead we invert such anchors and make their value positive.
We consider changing this sometime in the future but until then,
spacing must be non-negative at all times.
Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org>
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org>
|
| |
| |
| |
| |
| |
| |
| | |
toEncoded was returning an empty host instead of [::ffff:129.144.52.38]
Merge-request: 1735
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Always call the callbacks unlocked to avoid deadlocks.
(The others call to the callback ar unlocked)
Reviewed-by: Olivier Goffart
Merge-request: 1744
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When making a rubber band selection while Control is pressed in an
itemview with extended selection, make sure that the selection state
of the items inside the rubber band is toggled.
This ammend commit 0644e3dce532b1df00a77d3a30c61d6b75d3ff30
Merge-request: 1759
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
Reviewed-by: Gabriel
Task-number: QTBUG-1435
Task-number: 191545
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Forgot to remove the declaration from a source file because of a bad merge.
Reviewed-by: Bradley T. Hughes
|
| | |
| | |
| | |
| | | |
Reviewed-by: Olivier Goffart
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The constructor that accepts a gesture type is not needed because the
gesture type id will be generated by Qt and assigned to the QGesture
object when a custom gesture recognizer is registered within the
framework.
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The only reason to refer to values from the Qt::ShortcutContext enum is
to avoid confusing people since enum value names look similar so we want
to avoid weird behaviour when mixing them. But referring to another enum
value makes the documentation look weird as it mentions different
unrelated enum value in the GestureContext doc.
Reviewed-by: trustme
|
| | |
| | |
| | |
| | |
| | | |
The resolution of conflicts introduced regressions. And the commit
was already in 4.6
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QUuid::createUuid() only seeds the PRNG on the first entry, but since
it's using qsrand() and qrand(), all other threads will use the
default seed, and thus generate the exact same UUIDs.
Fix this by adding an internal function (qsrand() overload with no
args) which seeds the PRNG if it hasn't been done already, and use a
seed that is based on current time, a stack address and a global
serial counter (so that the chances of 2 threads using the same seed
are as low as possible).
Task-number: QTBUG-3543
Reviewed-by: Marius Storm-Olsen
|
| | |
| | |
| | |
| | |
| | |
| | | |
Also, unbind the texture after it is initialized.
Reviewed-by: Sarah Smith
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Reviewed by Simon Hausmann.
Sets Qt::WA_InputMethodEnabled and Qt::ImhHiddenText for password fields in EditorClientQt
setInputMethodState. This change is needed so widgets such as the s60 software
input panel can receive input method events for password fields.
It's up to the Qt platform to determine which widget will receive input method
events when these flags are set.
Also added implementation for setInputMethodEnabled and setInputMethodHint
to QGraphicsWebViewPrivate and QWebViewPrivate. This change removes the direct
dependency on QWebView and uses QWebPageClient.
Added autotest to tst_qwebpage.cpp
https://bugs.webkit.org/show_bug.cgi?id=30023
* Api/qgraphicswebview.cpp:
(QGraphicsWebViewPrivate::setInputMethodEnabled):
(QGraphicsWebViewPrivate::setInputMethodHint):
* Api/qwebview.cpp:
(QWebViewPrivate::setInputMethodEnabled):
(QWebViewPrivate::setInputMethodHint):
* WebCoreSupport/EditorClientQt.cpp:
(WebCore::EditorClientQt::setInputMethodState):
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::inputMethods):
2009-10-09 Joe Ligman <joseph.ligman@nokia.com>
Reviewed by Simon Hausmann.
[Qt] Added pure virtual methods setInputMethodEnabled and setInputMethodHint to QWebPageClient
https://bugs.webkit.org/show_bug.cgi?id=30023
* platform/qt/QWebPageClient.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49397 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Signed-off-by: Simon Hausmann <simon.hausmann@nokia.com>
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
According to the documentation gnome_icon_lookup_sync() can return an
absolute file path for the icon, so we check if the returned string
starts like a path, then we load the icon from the file.
This also fixes compilation warnings.
Reviewed-by: Olivier Goffart
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
"../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 860: error #2101: "size" has already been declared in the current scope
"../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 1560: error #2101: "span" has already been declared in the current scope
"../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 1807: error #2101: "s" has already been declared in the current scope
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
"../3rdparty/javascriptcore/JavaScriptCore/wtf/FastMalloc.cpp", line 2927: error #2101: "h" has already been declared in the current scope
for (TCMalloc_ThreadCache* h = thread_heaps; h != NULL; h = h->next_) {
^
|
| |/ /
| | |
| | |
| | | |
"../../include/QtGui/private/../../../src/gui/painting/qpaintengineex_p.h", line 77.10: 1540-0029 (S) The named enumeration is not defined.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Implemented gestures using gesture events and separate
QGesture/QGestureRecognizer classes.
Reviewed-by: trustme
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Set the softkey container window to be selectable even when pointer
is grabbed (via window server setting)
Task-number: QT-2203
Reviewed-by: Espen Riskedal
|
| | |
| | |
| | |
| | | |
Reviewed-by: Espen Riskedal
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When FontConfig was enabled, bitmap fonts would often get a different
pixel size than the one we requested. Usually the size would only be
a pixel off, but this was especially visible when printing in highres
with bitmap fonts, because in those cases we would request a pixel size
which was computed based on the printer's high dpi.
The result was that all printed text with bitmap fonts would be really
really tiny. The fix falls back to using the XLFD font engine when
using bitmap fonts (when the returned pixel size is different from the
requested), because this engine scales the fonts for us. This will
cause bitmap fonts to be rendered without antialiasing.
Task-number: QTBUG-3620
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | | |
localtime_r."
This reverts commit 2f7d1318d2dc63322a468d8c301ae718eaba0d03.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Keyboard navigation didn't work in the following cases:
- The last column was disabled and we pressed the tab key when at the 2nd
last column. (See ref. task).
- Spans with their anchor column or row hidden or disabled.
- Navigation would not preserve the original row/column when traversing a
span horizontally/vertically.
Auto-tests submitted with this commit.
Task-number: QTBUG-3878
Reviewed-by: Olivier
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is needed in case we change consistentTime while the animation is
running.
Reviewed-by: thierry
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When we select save as PDF in the print dialog, we get a new
PMPrintSession in the printInfo object, while our stored
one is deleted, so we update the pointer to be on the safe
side
Reviewed-by: msorvig
|
| | |
| | |
| | |
| | | |
Reviewed-by: Richard
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The map test case panic with E32User-Cbase 66 in N95 without this fix.
This happens sisnce Open C bug where mmap may leave and trap handler is
not inside OpenC. The workaround is to install the necessary TRAP
handler in Qt, before calling mmap.
AutoTests: tst_qfile::map passes
Reviewed-by: Janne Koskinen
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-2738
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added setOriginatingObject() and originatingObject() to QNetworkRequest
that internally tracks the QObject using a QWeakPointer.
Reviewed-by: Lars Knoll
Rubberstamped-by: Thiago
|
| | |
| | |
| | |
| | | |
Reviewed-by: David Boddie
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If you try to resolve 10.3.4.6, you're probably going to get that it
doesn't exist. On some systems, getnameinfo will return the IP address
in string form (Linux, without NI_NAMEREQD). On some others, it will
fail (Mac, Windows).
So harmonise by gracefully handling the case in which getnameinfo
fails.
Possible behaviour change: we don't try the forward resolution any
more, after completing the reverse one.
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The previous code was comparing QGLFramebufferObjectFormat::textureTarget()
against GL_RGB to determine if alpha was present. This should be
internalTextureFormat() instead.
Reviewed-by: Sarah Smith
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixing the surface memory leak in b125af1b for widgets caused this
knock-on effect in pbuffers.
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The previous code was searching for an exact pbuffer format of
RGBA = 1, 1, 1, 0, which of course is never going to happen.
Instead, search for the best format.
Reviewed-by: trustme
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: trustme
|