summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge QGV delta from kinetic-declarativeui into master.Andreas Aardal Hanssen2009-08-1710-11/+65
| | | | | | | | | | | | New flag: QGraphicsItem::ItemNegativeZStacksBehindParent, which makes it easy to toggle stack-behind based on the value of Z alone. Add interface initializations to QGV classes. Add a simple internal focus policy to QGraphicsItem to allow derived items to be focusable without allowing clickfocus. Reviewed-by: Alexis
* Fixed text rendering on GL ES 2 implementations.Trond Kjernåsen2009-08-172-12/+31
| | | | | | | | | | | Some GL ES 2 implementations seem to have problems with glCopyTexSubImage2D(), so we fall back and read the old font texture into system memory and re-upload the new font texture. Also, the precision used for texture coordinates in the fragment programs wasn't high enough, which could lead to rendering artifacts. Reviewed-by: Samuel
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-1795-345/+1154
|\
| * Add some more exception around to clucene index writer.kh12009-08-172-20/+60
| | | | | | | | Reviewed-by: ck
| * Fix a crash in the destruction of QListViewThierry Bastian2009-08-171-2/+4
| |
| * More coverity warnings removedThierry Bastian2009-08-175-15/+7
| |
| * qdoc: Fixed the bug that made reporting NOTIFY signals not work.Martin Smith2009-08-174-5/+12
| | | | | | | | | | | | | | | | | | | | The signal was being associated with a particular property, but in many classes, the NOTIFY signal applies to multiple properties. Added a new function to the PropertyNode class that adds the signal function without associating it with any property. Task-number: 259071
| * QTextControl::print: fix coverity warningThierry Bastian2009-08-172-4/+3
| | | | | | | | | | the test was wrong on the QPrinter pointer In addition, priv is never null
| * remove QT_RASTER_PAINTENGINE and QT_RASTER_IMAGEENGINE defines as they areGunnar Sletta2009-08-175-82/+33
| | | | | | | | | | | | legacy and completely pointless... Reviewed-By: Eskil
| * Fix coverity warningsThierry Bastian2009-08-175-9/+6
| |
| * QPaintDevice implemented in qpaintdevice.cpp. Saves duplicated codeGunnar Sletta2009-08-175-72/+69
| | | | | | | | Reviewed-by: Eskil
| * Transforms do not obey AnchorUnderMouse with viewport margins setGabriel de Dietrich2009-08-172-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | setTransformationAnchor(QGraphicsView::AnchorUnderMouse) would not work properly if viewport margins were set. When centering the view in QGraphicsViewPrivate::centerView, the viewport margins were not being taken into account. Mapping from global cursor coordinates in the viewport instead of the view fixes the issue. Task-number: 255529 Reviewed-by: Olivier
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMorten Sorvig2009-08-1759-104/+157
| |\
| | * Better handling of qreal with QVariantThierry Bastian2009-08-178-26/+33
| | |
| | * Fixed coverity warningsThierry Bastian2009-08-178-13/+13
| | |
| | * Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-1734-52/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
| | * Add LIBS_PRIVATE to qmake.Thiago Macieira2009-08-178-13/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The difference between LIBS and LIBS_PRIVATE is that private libraries are those that are not part of the public interface of a library. For example, if you're writing a Qt application and link to QtGui, you definitely need the development files for QtCore, but not necessarily for Glib and GThread, or maybe even X11. The private libraries are necessary only in static builds, so the information should still be published in .prl and pkg-config files. Reviewed-By: Marius Storm-Olsen
| | * doc: Eliminated two qdoc error reports.Martin Smith2009-08-171-0/+10
| | |
| | * qpdf: fix memory leak detected by coverityThierry Bastian2009-08-171-0/+3
| | |
| | * Doc: Mention that destroying an item that belongs to a QGraphicsScene is ↵Olivier Goffart2009-08-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | inneficient As the virtual functions (such as the boundingRect()) are not available anymore in the destructor, the view has to refresh everything. Reviewed-by: Alexis
| * | Fix compiler flags setting for .mm files on Mac.Morten Sorvig2009-08-171-2/+1
| |/ | | | | | | | | | | Commit 7f1cba82 causes {x86, x86_64, ppc, ppc64}.prf to be loaded before objective_c.prf. This will add content to QMAKE_OBJECTIVE_CFLAGS, causing the isEmpty test to skip populating QMAKE_OBJECTIVE_CFLAGS. Remove the isEmpty test to fix the issue.
| * Snippet files for gesture overview documentationPeter Yard2009-08-174-0/+734
| |
| * Doc: Fix links and silence qdoc warnings.Volker Hilsheimer2009-08-163-24/+25
| |
| * Fixed compile.Rohan McGovern2009-08-141-3/+3
| | | | | | | | Put EffectParameter::userType back to EffectParameter::type.
| * Fixed compile.Rohan McGovern2009-08-141-1/+1
| | | | | | | | | | Put QString::toReal back to QString::toDouble, there is no QString::toReal.
* | Doc: Fixed number of commercial editions.David Boddie2009-08-171-2/+1
|/ | | | Reviewed-by: Trust Me
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-149-69/+206
|\
| * Autotest for correct word wrapping on text next to floating objectEskil Abrahamsen Blomfeldt2009-08-141-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | We set the document's page size to be large enough to contain an image which is 100 pixels wide and one, but not two, instances of the word 'Foobar'. We then render HTML which contains a string with repeated occurrences of the word 'Foobar' next to a floating, right-aligned image which is 100 pixels wide. The layout should break on word boundaries, since this is the default in QTextDocument, and thus each text line should contain one instance of the word 'Foobar'. Task-number: 240325
| * Avoid wrapping outside word boundaries in QTextDocument unless necessaryEskil Abrahamsen Blomfeldt2009-08-141-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | If you have a floating object which affects the width available to the text, we need to recalculate the width of the text line. In the code, the setLineWidth() call to do this would by default have WrapAnywhere as its wrap mode, even when this was not necessary. The code has now been moved so that WrapAnywhere is only used if we try to set the line width to match the available width and detect that the text is too wide (the natural text width exceeds the available space.) Task-number: 240325 Reviewed-by: Simon Hausmann
| * Reimplement qSwap and Q_DECLARE_SHARED differently.Thiago Macieira2009-08-146-41/+92
| | | | | | | | | | | | | | | | | | This enables the use of Q_DECLARE_SHARED with d-pointers that are QExplicitlySharedDataPointer<PrivateClass>. Also, this enables swapping atomically QSharedPointers. Reviewed-by: Harald Fernengel
| * Perform license checks on source files.Frans Englich2009-08-141-19/+65
| | | | | | | | | | | | | | Previously we only checked headers, but we actually care about source files too. This detects about 50 errors all over Qt. Discussed with Thiago.
* | Doc: Removed claims that QDialog supports border style sheet settings.David Boddie2009-08-141-3/+3
|/ | | | | | Task-number: 255853 Reviewed-by: Trust Me I'm-trusting: The information in the task :-)
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-08-14357-8753/+20007
|\
| * QVariant: more work on avoinding conversion between float and doublesThierry Bastian2009-08-145-16/+16
| | | | | | | | we call QVariant::toReal instead of toDouble when needed
| * Fixed Coverity defect CID 1528.Gabriel de Dietrich2009-08-141-1/+1
| | | | | | | | Reviewed-by: Olivier
| * Removing some unused variables.Alessandro Portale2009-08-146-16/+0
| |
| * QCssParser: reordering initializers to match declarationThierry Bastian2009-08-141-1/+1
| |
| * Fixed coverity warningsThierry Bastian2009-08-1416-37/+26
| | | | | | | | | | Some dead code removed Some member not initialized missing
| * QVariant: added toFloat and toRealThierry Bastian2009-08-1414-48/+90
| | | | | | | | | | | | | | | | Made better use of qreal all over the place. We were previously using QVariant::toDouble a lot. That is triggering unnecessary conversions between float and double on embedded. Reviewed-by: ogoffart
| * Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not setTor Arne Vestbø2009-08-141-1/+1
| | | | | | | | | | | | This matches the logic for the 'lib' template to the one for 'app'. Reviewed-by: Simon Hausmann
| * Cocoa: Fix several issues with the event dispatcherRichard Moe Gustavsen2009-08-146-193/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autotest: qcoreapplication, qapplication, qtimer qwidget_window, qwidget Issue 1: stacking order of modal windows was not working correctly. With this patch, we remove the need for rebuilding modal sessions all the time, and when we do, we rebuild them all in the correct order. Issue 2: When running the event processor manually (that is, just calling processEvents in a loop), we sometimes spendt 100% cpu if a window was pending to become modal. The reason was that we need to keep reposting the QCocoaRequestModal event until we could block the calling thread (that is, one of the exec flags was given to processEvents). With this patch, the need for posting QCocoaRequestModal is completly removed in favor of an 'interrupt' approach instead. Issue 3: If using Qt as a plugin, or just add widget to a native cocoa application, it would often lead to closing down the application. The reason is that the event dispatcher needs to restart [NSApp run] now and then. But this approach fails if Qt was not the code that started [NSApp run] in the first place. This patch removes the need to restart NSApp in this situation, at the cost of modal windows not beeing modal if Qt is not spinning the event dispatcher. Normal QDialog::exec etc will always work.
| * Our modifications to freetypeHarald Fernengel2009-08-148-23/+292
| |
| * Add freetype 2.3.9Harald Fernengel2009-08-14661-0/+292236
| |
| * Deleted freetype 2.3.6Harald Fernengel2009-08-14650-282668/+0
| |
| * Simplify WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-2/+2
| | | | | | | | | | | | Limit the changelog to WebKit/qt. Reviewed-by: Trust me
| * QTextFormat: better use QVariant::userType over QVariant::typeThierry Bastian2009-08-141-15/+15
| | | | | | | | | | it was even a bug when checking against QMetaType::Float because Float is a user type so it could never be true
| * Fix WebKit import into src/3rdparty/webkitSimon Hausmann2009-08-141-0/+3
| | | | | | | | | | | | Exclude platform/wince and platform/graphics/haiku Reviewed-by: Trust me
| * Fix trailing space in snippet file for gesture documentation.Peter Yard2009-08-141-1/+1
| |
| * Gesture Overview DocumentationPeter Yard2009-08-145-0/+1163
| | | | | | | | | | | | | | Overview of QGesture class and reference to QStandardGestures Gesture overview using ImageViewer example to demonstrate use of class by implementer.
| * Make Qt::NoGesture visible. Needed for QGesture subclassing.Peter Yard2009-08-141-1/+1
| |
generated by cgit v0.12 at 2025-08-21 10:41:42 (GMT)