summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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-269-6/+8
| | | | | | | | 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-263-61/+107
|\ \ | |/
| * Autotest: Fix a few test names and allow me to see the compilation errorsThiago Macieira2009-06-261-3/+10
| | | | | | | | Reviewed-by: TrustMe
| * 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
| * Autotest for checking if QWidget::setStyle() forces a relayout.Jan-Arve Sæther2009-06-261-1/+78
| |
* | 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-2611-95/+146
|\ \ | |/
| * make autotests work with shadowbuildsKent Hansen2009-06-266-3/+6
| | | | | | | | Can't assume that the executable and source are in the same dir.
| * 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-262-1/+18
| | | | | | | | | | | | | | 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-2613-6/+337
|\ \ | |/
| * Merge branch '4.5'Thiago Macieira2009-06-2613-6/+337
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
| | * Fix build on Solaris: test -e isn't available to Bourne shellsThiago Macieira2009-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | I don't know why, even though it's specified in POSIX. But we have to cope with broken stuff. Reviewed-by: Bradley T. Hughes
| | * make invokable constructors work with classes in namespaceKent Hansen2009-06-253-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2511-21/+144
| | | | | | | | | | | | 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-255-2/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2636-168/+369
|\ \ \ | |/ /
| * | Eliminate warning during configureGareth Pethig2009-06-261-1/+1
| | | | | | | | | | | | | | | | | | .../configure: line 4462: [: missing `]' Reviewed-by: Jason McDonald
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJustin McPherson2009-06-261306-148903/+178177
| |\ \
| | * | 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-252-5/+20
| | | | | | | | | | | | | | | | Task-number: 256918
| | * | Merge branch '4.5'Thiago Macieira2009-06-257-15/+32
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | 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-253-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | QToolBar: fixed a typo that would make the handle wider.Thierry Bastian2009-06-251-1/+1
| | | |
| | * | QMAinWindow: Fixed autotest compilation after private API changesThierry Bastian2009-06-251-4/+1
| | | |
| | * | Fixed missing restoration of state after a sync in the GL 2 engine.Samuel Rødal2009-06-252-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sync() function properly sets up the state to allow using raw OpenGL commands with an active QPainter, but we also need to properly restore the state after sync() has been called and some other painting operation is done. Reviewed-by: Trond
| | * | Fixed buggy clipping when using projective transforms in GL 2 engine.Samuel Rødal2009-06-251-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gl_Position x, y, and z coordinates are always divided by the homogenuous w coordinate to yield the final coordinates. Since we want the depth to be constant for the whole item we need to premultiply it by the w-coordinate. We can do this in the main() function in the vertex programs since all the vertex programs use the depth uniform, thus simplifying the programs a bit. Reviewed-by: Trond
| | * | Only instantiate the PICT pasteboard MIME when we have to.Norwegian Rock Cat2009-06-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10.6 does a lot of image synthesis for us when we put up a tiff, which is great because we don't have to do a thing and it will work with all the applications out there. This means we don't need our PICT convertor on 10.6 for 32-bit apps. However, this magic doesn't exist in earlier versions of Mac OS X, so we have to keep it around (along with the QuickTime symbol resolving) there. Reviewed-by: Morten Sørvig
| | * | Cannot move fixed size windows using titlebar (only on top edge)Prasanth Ullattil2009-06-251-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WM_NCHITTEST has to return the location type based on the position, instead of returning just true or false. Reviewed-by: Marius Storm-Olsen
| * | | Always iodbc on OSX platform.Justin McPherson2009-06-261-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Bill King
* | | | Don't build the pannablewebview example if webkit is disabledBradley T. Hughes2009-06-261-1/+4
| | | |
* | | | Add tests for multiple touch points on TouchScreen and TouchPad devicesBradley T. Hughes2009-06-251-9/+434
| | | | | | | | | | | | | | | | | | | | | | | | Add 2 basic tests that, when faced with multiple touch points, make sure we send multiple touch events on TouchScreen devices, but only one event on TouchPads.
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-251-7/+9
|\ \ \ \ | | |/ / | |/| |
| * | | Compile with the following defines:msorvig2009-06-251-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | QT_NO_DRAGANDROP QT_NO_ACTION QT_NO_GRAPHICSVIEW
generated by cgit v0.12 at 2025-02-08 18:33:31 (GMT)