summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5'Thiago Macieira2009-06-282-5/+9
|\
| * Fix detection of the ELF interpreter on Linux.Thiago Macieira2009-06-282-5/+9
| | | | | | | | | | | | The path /lib/ld-linux.so.2 is correct for i386 only, possibly some other archs. But on x86-64, it's usually ld-linux-x86-64.so and it can be in either /lib or /lib64.
* | Merge branch '4.5'Thiago Macieira2009-06-282-3/+21
|\ \ | |/
| * Fix painting errors in QScrollArea on Mac (Carbon)Morten Sørvig2009-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mainly a stop-gap solution for 4.5.x. It trades painting performance for correct painting. Commit 7988d05da changed the opaque test from q->testAttribute(Qt::WA_OpaquePaintEvent) to qt_widget_private(w)->isOpaque in qt_mac_update_widget_posisiton. This means we'll do optimized moves in more cases. Unfortunately it also causes painting errors in some cases (see the task). Revert the commit for now to put the 4.5 branch in a god shape. Task-number: 252295 Reviewed-by: nrc
| * Fixed cap and join styles when printing to native Windows printers.Trond Kjernaasen2009-06-261-1/+19
| | | | | | | | | | | | | | | | Line and polygon strokes did not respect the join/cap styles set on a painter. Task-number: 256914 Reviewed-by: Samuel
* | Fixed link error of some test tools due to multiply definedRohan McGovern2009-06-271-0/+1
| | | | | | | | QTest::touchEvent().
* | Fixed compile on Unix.Rohan McGovern2009-06-271-0/+1
| | | | | | | | | | Fixes error: src/gui/kernel/qevent_p.h:62: error: invalid use of incomplete type ‘struct QKeyEvent’
* | QMenu: refactor for the QWidgetActions' widget.Thierry Bastian2009-06-262-30/+24
| | | | | | | | | | We now use QList/QVector over QHash. It is more efficient because most of the time we iterate over the list of actions anyway.
* | QMenu: refactor of the update of the geometry to have one central placeThierry Bastian2009-06-262-183/+144
| | | | | | | | of calculation (ie. updateActionRects)
* | QMenu: Fixed a painting regressionThierry Bastian2009-06-262-7/+14
| |
* | Silenced a warning caused by (apparently) a gcc 4.3 bug:Thiago Macieira2009-06-263-11/+9
| | | | | | | | | | | | | | | | | | gcc 4.3 and 4.4 keep giving us a warning like: 'function()::type' declared with greater visibility than the type of its field 'function()::type::subtype' This seems to be a gcc bug. See the bug report for more information: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40145
* | Silence trivial warningsThiago Macieira2009-06-262-4/+6
| |
* | Fixed a gcc 4.4 warning on switching a value outside the enum.Thiago Macieira2009-06-262-8/+13
| | | | | | | | | | These four enum values are used in variables of type Section, but aren't in it. With gcc 4.4, it displays a warning that the value is lower than the lowest value
* | De-export the ThreadEngineBarrier class and de-inline the call to acquire.Morten Sørvig2009-06-262-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (ThreadEngineBarrier was implemented in the header as ThreadEngineSemaphore in Qt 4.4 and Qt 4.5, and exported for a brief time in the Qt master branch. ) Unfortunately the inline call to acquire means that applications compiled with Qt 4.4. and Qt 4.5 will contain a copy of the old implementation. This is BC as long as the memory layout of the ThreadEngineBarrier class stays the same, which means that we keep the QMutex member variable. The old version of acquire will no longer be thread-safe since the new version doesn't lock the mutex, but this is fortunately not a problem; the only place it's called is in startAsynchronously() before the worker threads are started.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-3/+3
|\ \
| * | qtscript meta-object binding: enum properties are not deletableKent Hansen2009-06-261-3/+3
| | |
* | | Compile on WinCEBradley T. Hughes2009-06-261-6/+8
|/ / | | | | | | | | | | | | Replace the SIZE constant with an Enum with a Qt-ish CamelCased name (since SIZE conflicts with the system headers). Reviewed-by: TrustMe
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-1/+1
|\ \
| * | QMenu: fixed regression in autotestThierry Bastian2009-06-261-1/+1
| | |
* | | Cleanup includes in public headers.Bradley T. Hughes2009-06-268-6/+7
| | | | | | | | | | | | We don't want to pull in too much if we can avoid it.
* | | CompileBradley T. Hughes2009-06-261-10/+10
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-261-57/+19
|\ \ \ | |/ /
| * | Clean up QSharedPointer cast implementations.Thiago Macieira2009-06-261-57/+19
| | | | | | | | | | | | | | | | | | | | | There's no need to have separate cast-checker functions, plus the cast- and centralise the function to create the object. Reviewed-by: TrustMe
* | | Don't always send spontaneous events to QGraphicsSceneBradley T. Hughes2009-06-261-5/+17
| | | | | | | | | | | | | | | Only do that if the original event delivered to the QGraphicsView was also spontaneous.
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-264-92/+123
|\ \ \ | |/ /
| * | QMenu refactor to simplify a bit geometry calculationThierry Bastian2009-06-262-90/+92
| | |
| * | Add some macro expressions to qglobal.h for typeof, alignof and aligned().Thiago Macieira2009-06-261-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | These expressions aren't used anywhere yet, but I am sure we will find use for them very soon now. I checked the compiler manuals for the three commercial Unix compilers to verify which versions support these macros. Reviewed-by: Bradley T. Hughes
| * | QVariant::setValue had a bug when changing its typeThierry Bastian2009-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | If it was shared and you then set it back to an int type, it is still marked as shared,. This might even lead to crashes. The patch was sent through gitorious by Jürgen Starek. Note: autotest added as well
* | | Fix bad mergesBradley T. Hughes2009-06-262-8/+1
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-266-4/+54
|\ \ \ | |/ /
| * | Merge branch '4.5'Thiago Macieira2009-06-266-4/+54
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
| | * make invokable constructors work with classes in namespaceKent Hansen2009-06-252-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the fully qualified classname at relevant places in the moc-generated code. Also, QMetaObject::newInstance() needs to strip the namespace part, since the constructor signatures don't contain the fully qualified name. Task-number: 246064 Reviewed-by: Simon Hausmann
| | * Bump Qt version number.Jason McDonald2009-06-253-4/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ↵Simon Hausmann2009-06-253-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e65b4879116f4a8b0ee8b09607eef666c68c61d6 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-06-25 Simon Hausmann <simon.hausmann@nokia.com> Reviewed by and done with Tor Arne Vestbø. Fix shortcut keyboard handling with plugins on the Qt/Mac build. When we receive shortcut events like Ctrl+V then the text in the QKeyEvent is empty. If we're asked to disambiguate the event into a Char keyboard event, we try to detect this situation and still set the text, to ensure that the general event handling sends a key press event after this disambiguation. * platform/qt/PlatformKeyboardEventQt.cpp: (WebCore::PlatformKeyboardEvent::disambiguateKeyDownEvent):
| | * QNetworkReplyImpl: Protect against recursive event loopsMarkus Goetz2009-06-252-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that occured together with a QProgressDialog. The signal emission was like: readyRead readyRead readyRead [...] readyRead finished readyRead Now finished should be properly at the ending of this sequence. Task-number: 256630 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-2631-162/+322
|\ \ \ | |/ /
| * | Improved support for DPI on Mac and Vista/7Jens Bache-Wiig2009-06-258-77/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This significantly improves the support for higher DPI-values on these platforms by ensuring that common pixelmetrics are scaled accordingly. In addition we mark all Qt apps as DPI-aware on Windows 7 by calling SetProcessDPIAware. We also changed the way we draw pixmaps on the mac paintengine when using dpi scaling > 1 to ensure smooth pixmap scaling. Reviewed-by: nrc Task-id: 242417
| * | make it possible to support queued connections in qtscriptKent Hansen2009-06-256-17/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change doesn't actually add public API for it, but makes it trivial to add. On the C++ side, qScriptConnect() would get an overload that takes an additional argument, the connection type (d'oh, it should have had a default argument to begin with!). On the script side, it's a bit more tricky to "overload" the existing connect(), since it's already "overloaded" (can have either one or two parameters). Plus, I'd like connect() to be able to support bind-like functionality so you can pass additional arguments to it that will be passed to the signal handler at signal emission time. Oh well, we'll see.
| * | QNAM HTTP Code: Prepare for download performance improvementsMarkus Goetz2009-06-254-9/+27
| | | | | | | | | | | | | | | | | | Change the QByteArray to a QRingBuffer to save re-allocation time. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | QMenu: Fixed geometry for actions with specific fontThierry Bastian2009-06-251-5/+5
| | | | | | | | | | | | Task-number: 256918
| * | Merge branch '4.5'Thiago Macieira2009-06-256-14/+30
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
| | * Change QSharedPointer to track (or not) pointers when the #define isThiago Macieira2009-06-252-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. This allows mixing of debug and non-debug code (possible on Unix systems) without causing assertion failures. Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| | * save on a couple of mallocsDerick Hawcroft2009-06-241-1/+1
| | |
| | * Fix off by one bug in DirectFBPaintEngineAnders Bakken2009-06-241-2/+2
| | | | | | | | | | | | | | | | | | This bug made us call lock more than we needed to. Reviewed-by: Donald <qt-info@nokia.com>
| | * Fix a rendering issueAnders Bakken2009-06-242-3/+8
| | | | | | | | | | | | | | | | | | Make sure surfaces always are locked when used as source for something. Reviewed-by: TrustMe
| | * Fixup ibase.Derick Hawcroft2009-06-241-2/+2
| | | | | | | | | | | | delete -> delete []
| | * Make sure simplePen gets set properlyAnders Bakken2009-06-241-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | The logic regarding whether or not a pen was simple was broken. Essentially the pen is sonly simple if it should en up as a single pixel line. Reviewed-by: Donald <qt-info@nokia.com>
| * | have the QtScript print() function use qDebug()Kent Hansen2009-06-251-2/+1
| | | | | | | | | | | | | | | | | | Makes it work with custom message handlers (qInstallMsgHandler()). Task-number: 233005
| * | don't crash when QTextCodec::codecForUtfText() is passed -1 bytesKent Hansen2009-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible that the function gets called with a bytearray of size -1 (for example, by QTextStreamPrivate::fillReadBuffer()). Since the size was erroneously cast to a uint, the subsequent comparison (arraySize > 3) succeeded and caused a crash. Reviewed-by: Denis Dzyubenko
| * | QNAM HTTP Code: Uncluttering functionsMarkus Goetz2009-06-253-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | Uncluttered and duplicated some function to make it more clear what is happening. Was a bit confusing before if compressed data or uncompressed data is handled. Reviewed-by: Peter Hartmann