summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fixes' of ↵Jan-Arve Sæther2009-10-153-181/+251
|\ | | | | | | | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into openbossa-fleury-fixes Conflicts: src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
| * QGAL: refactor calculateGraphs() methodCaio Marcelo de Oliveira Filho2009-10-092-75/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * QGAL: update the sizes of all anchors instead of doing it separatedlyCaio Marcelo de Oliveira Filho2009-10-092-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * QGAL: avoid having to re-calculate lists of variablesCaio Marcelo de Oliveira Filho2009-10-092-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * QGAL: add a way to test whether simplex was used in a calculationCaio Marcelo de Oliveira Filho2009-10-092-0/+12
| | | | | | | | | | | | | | | | | | | | 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>
| * QGAL: improve dump graph and add helper codeCaio Marcelo de Oliveira Filho2009-10-092-3/+13
| | | | | | | | | | | | | | | | | | 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>
| * QGraphicsAnchorLayout: Fix sequential anchor distribution w/ expanding sizesEduardo M. Fleury2009-10-091-86/+76
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * QGraphicsAnchorLayout: Ensure spacing is not negativeEduardo M. Fleury2009-10-092-0/+33
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix QUrl regression with setHost("::ffff:129.144.52.38")David Faure2009-10-131-2/+7
| | | | | | | | | | | | | | toEncoded was returning an empty host instead of [::ffff:129.144.52.38] Merge-request: 1735 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | QMetaObject::activate: reordered mutex locks/unlocks around spyFlorian Vichot2009-10-131-2/+3
| | | | | | | | | | | | | | | | Always call the callbacks unlocked to avoid deadlocks. (The others call to the callback ar unlocked) Reviewed-by: Olivier Goffart Merge-request: 1744
* | Itemview: fix regression concerning Ctrl+rubber band selectionsFrank Reininghaus2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge commit '8df79a473e1a7e5c79b9b10827985bf3e9501002' into 4.6Alexis Menard2009-10-1259-1391/+2041
|\ \
| * | Compile fix after the latest change to gesture api.Denis Dzyubenko2009-10-121-8/+1
| | | | | | | | | | | | | | | | | | Forgot to remove the declaration from a source file because of a bad merge. Reviewed-by: Bradley T. Hughes
| * | Fixed warnings autotest.Denis Dzyubenko2009-10-122-2/+2
| | | | | | | | | | | | Reviewed-by: Olivier Goffart
| * | Removed the QGesture contructor that we don't really need.Denis Dzyubenko2009-10-122-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fixed enum values in Qt::GestureContext.Denis Dzyubenko2009-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Revert merge commit 3945fd75a93d790434b33c2d23aOlivier Goffart2009-10-121-1/+1
| | | | | | | | | | | | | | | The resolution of conflicts introduced regressions. And the commit was already in 4.6
| * | QUuid::createUuid() not unique when using threads on UnixBradley T. Hughes2009-10-122-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Don't delete an fbo's texture if the fbo isn't using a textureRhys Weatherley2009-10-122-2/+4
| | | | | | | | | | | | | | | | | | Also, unbind the texture after it is initialized. Reviewed-by: Sarah Smith
| * | 2009-10-09 Joe Ligman <joseph.ligman@nokia.com>Joe Ligman2009-10-117-5/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-10-102-5/+6
| |\ \
| | * | Fixed getting an icon for a file on the filesystem with gnome.Denis Dzyubenko2009-10-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Fixed compilation warning by removing unused variables.Denis Dzyubenko2009-10-091-2/+0
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| * | | Fix compilation with aCC 6: this compiler has broken for scopingThiago Macieira2009-10-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | "../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
| * | | Fix compilation with aCC 6: cannot redefine a variable in the same scopeThiago Macieira2009-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | "../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_) { ^
| * | | Fix compilation with xlC 7: you can't forward-declare enums.Thiago Macieira2009-10-091-6/+1
| |/ / | | | | | | | | | "../../include/QtGui/private/../../../src/gui/painting/qpaintengineex_p.h", line 77.10: 1540-0029 (S) The named enumeration is not defined.
| * | A new implementation of the Gesture API.Denis Dzyubenko2009-10-0938-1315/+1832
| | | | | | | | | | | | | | | | | | | | | Implemented gestures using gesture events and separate QGesture/QGestureRecognizer classes. Reviewed-by: trustme
| * | Doc: Created a snippet to generate the global colors image.David Boddie2009-10-091-12/+15
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Workaround for softkeys not working in modal dialogs on S60 5.0Shane Kearns2009-10-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix compile error on symbian platformShane Kearns2009-10-091-0/+4
| | | | | | | | | | | | Reviewed-by: Espen Riskedal
| * | Fix printing bitmap fonts on X11 with FontConfig enabledEskil Abrahamsen Blomfeldt2009-10-093-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Revert "Workaround for OpenC daylight saving cache issue when using ↵Aleksandar Sasha Babic2009-10-091-30/+2
| | | | | | | | | | | | | | | | | | localtime_r." This reverts commit 2f7d1318d2dc63322a468d8c301ae718eaba0d03.
* | | Fixed keyboard navigation for QTableViewGabriel de Dietrich2009-10-123-71/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Update lastTick on all timerTicks in QAbstractAnimationLeonardo Sobral Cunha2009-10-091-7/+4
| | | | | | | | | | | | | | | | | | | | | This is needed in case we change consistentTime while the animation is running. Reviewed-by: thierry
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-0925-128/+218
|\ \ \ | |/ /
| * | Fixed crash when printing to files under CocoaGunnar Sletta2009-10-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fixed text positioning when printing in HighResolution on Mac OS XGunnar Sletta2009-10-091-3/+4
| | | | | | | | | | | | Reviewed-by: Richard
| * | Fix qdoc warning about undocumented parameterSimon Hausmann2009-10-091-1/+1
| | | | | | | | | | | | Reviewed-by: Trust me
| * | Fix for tst_qfile::map auto test in Symbian OS 3.1.Janne Anttila2009-10-091-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Made QPen::setDashOffset() work with non-custom dashed lines.Kim Motoyoshi Kalland2009-10-091-3/+11
| | | | | | | | | | | | | | | Task-number: QTBUG-2738 Reviewed-by: Trond
| * | Add a way to allow tracking the originating object with QNetworkRequest.Simon Hausmann2009-10-093-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | Added setOriginatingObject() and originatingObject() to QNetworkRequest that internally tracks the QObject using a QWeakPointer. Reviewed-by: Lars Knoll Rubberstamped-by: Thiago
| * | Fixed doc for softkeys in the qwidget doc.Denis Dzyubenko2009-10-091-2/+1
| | | | | | | | | | | | Reviewed-by: David Boddie
| * | Fix QHostInfo IP resolution when there's no reverse for the IP.Thiago Macieira2009-10-092-50/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jan-Arve Sæther2009-10-0946-263/+438
| |\ \
| | * | Check the framebuffer format against a format, not a texture targetRhys Weatherley2009-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Suppress unnecessary warning messages if pbuffers are not supportedRhys Weatherley2009-10-091-3/+10
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | EGL_SAMPLES should be 1, not -1, to select number of samplesRhys Weatherley2009-10-091-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | Prevent double-destroy of a pbuffer's EGLSurfaceRhys Weatherley2009-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the surface memory leak in b125af1b for widgets caused this knock-on effect in pbuffers. Reviewed-by: trustme
| | * | Fix detection of pbuffers on OpenGL/ES systemsRhys Weatherley2009-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Don't print EGL buffer size if it isn't set.Rhys Weatherley2009-10-081-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: trustme
generated by cgit v0.12 at 2024-10-27 03:22:08 (GMT)