summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update license headers according to commit 858c70f768e.axis2009-08-06151-342/+379
| | | | RevBy: Trust me
* Replaced $MODULE$ with hardcoded module names.axis2009-08-0674-75/+75
| | | | RevBy: Trust me
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-065-127/+129
|\
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-063-1/+3
| |\
| | * Fix extern WebKit build that uses qmake generators.Simon Hausmann2009-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore.pro's generators use QMAKE_DEL, which when used with del.exe works if the file is present or not. In the QMAKE_SH branch QMAKE_DEL is mapped to rm, which complaints if the file to delete doesn't exist. Similar to del.exe and unix.conf use rm -f instead of rm for QMAKE_DEL in the QMAKE_SH branch. Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| | * Fix WebKit compilation outside of Qt with SBS.Simon Hausmann2009-08-061-0/+1
| | | | | | | | | | | | | | | | | | Propagate QMAKE_MOVE similar to commit 392ad41ba0c0d61d65e2c218ebf3b1a951a4c30a. Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| | * Fix WebKit compilation outside of Qt.Simon Hausmann2009-08-061-0/+1
| | | | | | | | | | | | | | | | | | WebKit's .pro file uses shell commands that use QMAKE_MOVE/MOVE. The Symbian generator propagates DEL_FILE, but forgot to also propagate MOVE, like it is done for example in unixmake2.cpp.
| * | Move socket wrapper functions into the .cpp file.Jason Barron2009-08-062-126/+126
| |/ | | | | | | | | | | | | These functions were in the header, but didn't really need to be since they are used by one source file (if at all). Since the header file is included by other platforms, let's move them rather than ifdef'ing them.
* | Fixed network examples building for SymbianMiikka Heikkinen2009-08-061-1/+2
| |
* | Removed some commented out code from qmakeMiikka Heikkinen2009-08-061-2/+0
| |
* | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-064238-241225/+171192
|\ \ | |/
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Harald Fernengel2009-08-061-0/+6
| |\ | | | | | | | | | master-origin
| | * Fix linking of applications that use QFontDatabase::removeApplicationFont.Simon Hausmann2009-08-061-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Application font support requires the platform to implement the private registerFont() function, but it is also necessary to implement the public QFontDatabase::removeApplicationFont() function in the platform fontdatabase. The former is implemented as a stub, indicating an error to the caller. The latter was missing as a stub, causing link errors in WebKit. Reviewed-by: Jason Barron
| * | Rename Q_DECLARE_SCOPED_PRIVATE back to Q_DECLARE_PRIVATEHarald Fernengel2009-08-06396-487/+487
| |/ | | | | | | | | | | Rationale: We're using template magic now to get the private pointer in qglobal.h, so no need to have two macros. Also keeps backward compatibility with outside (KDE) code.
| * fix another broken mergeHarald Fernengel2009-08-061-5/+5
| |
| * fixed borked up mergeHarald Fernengel2009-08-061-0/+3
| |
| * Converted file from dos to unix linefeeds.Simon Hausmann2009-08-061-12/+12
| |
| * Merge commit 'qt/master-stable'Jason Barron2009-08-06187-1082/+14523
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe doc/src/classes/qnamespace.qdoc examples/examples.pro src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qobject.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qstandardgestures.h src/gui/kernel/qwidget.cpp
| | * Add benchmark for deleting an item with many children.Andreas Aardal Hanssen2009-08-051-0/+11
| | | | | | | | | | | | | | | Task-number: 229124 Reviewed-by: TrustMe
| | * Add benchmarks for QGraphicsItem::setParenItem().Andreas Aardal Hanssen2009-08-052-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure we test simple and deep constructs of setParentItem(). These benchmarks don't cover slowness in ancestor flag updating. QVariant is already identified as a contributor to this slowness, as is updating of the depth value (a deep tree crawl). Reviewed-by: Aaron Kennedy
| | * Compile fix (QGraphicsItem::setXRotation was removed).Andreas Aardal Hanssen2009-08-051-13/+1
| | | | | | | | | | | | | | | | | | | | | a6ea9ce6990003856ecadcca8ce9ddf37949363d removed this function; the benchmark was not updated. Reviewed-by: TrustMe
| | * Merge AudioServices into mainline.Justin McPherson2009-08-0588-2/+12950
| | |
| | * Merge branch '4.5'Bill King2009-08-0511-19/+71
| | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | | * Get more database tests working/passing.Bill King2009-08-052-4/+18
| | | |
| | | * Make file extension case insensitive with the Gtk+ file dialogJens Bache-Wiig2009-08-041-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt dialog treats extension filters as case insensitive where the default behavior of the Gtk+ file dialog is to be case sensitive. The GtkFileFilter allows only simple glob syntax to be used so we basically rewrite the extension string from .xyz to .[xX][yY][zZ]. Task-number: 259155 Reviewed-by: joao
| | | * Fix: Gtk native dialogs do not repaint when zero-timers are usedJens Bache-Wiig2009-08-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that our glib timers were given too high priority, effectively starving the Gtk event loop. By assigning our timer source, G_PRIORITY_DEFAULT_IDLE we ensure that all gtk+ events are handled first, thus allowing the native dialogs to respond and repaint properly. Task-number: 258433 Reviewed-by: bhughes
| | | * Fix indentation.Alexis Menard2009-08-041-1/+3
| | | | | | | | | | | | | | | | Reviewed-by:TrustMe
| | | * Fix ancestor flags that are not correctly update when reparenting.Alexis Menard2009-08-042-11/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updateAncestorFlags was not reseting the flags if you change the parent that have for instance itemsClipChildrenToShape to a new one that doesn't have that flag. Task-number:258956 Reviewed-by:bnilsen
| | | * Build on snow leopard.Morten Sorvig2009-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Don't error out when building qmake, just let it build a 64-bit binary (even for carbon) RebBy: Richard Moe Gustavsen
| | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-08-042-0/+3
| | | |\
| | | | * Preserved fill rule for perspective mapped strokes in raster engine.Samuel Rødal2009-08-032-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 254407 Reviewed-by: Gunnar
| | | * | Fix obsolete license headersJason McDonald2009-08-045-12/+10
| | | |/ | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Fixes casing issue in the PSQL driver.Bill King2009-08-051-5/+5
| | | | | | | | | | | | | | | | | | | | The record and primaryIndex functions don't take into account that psql treats different casing as different entities when enquoted.
| | * | Fix compilation after my last change to qobject_p.hThiago Macieira2009-08-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I renamed deletionNotification back to its original name. I had forgotten that QWidget needed a similar change. Reviewed-by: Trust Me
| | * | Fixed bug where Q[Styled]ItemDelegate edition wouldn't terminate whenGabriel de Dietrich2009-08-043-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the item lost focus to an unrelated dialog. The tests against the active modal window was unnecessary. Task-number: 257859 Reviewed-by: olivier
| | * | Restore the old name for QObjectDeletionNotification.Thiago Macieira2009-08-042-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we're going to do changes to simplify some of the Declarative UI enablers, let's do them all at once. That way, the adaptation necessary happens only once, as opposed to every time we do the changes. I tried not to break by leaving a typedef, but obviously the QObjectPrivate member isn't affected by the typedef... Reviewed-by: Trust Me
| | * | Revert "Remove currentChildBeingDeleted from QObjectPrivate."Thiago Macieira2009-08-042-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 128717b171f01c82e5f0fb83f5923d4f7b9cfc10. The change broke Alien because QWidget no longer has the native window handle in its own private. It needs to access the top-level window (or the one with the native handle) in order to perform some operations. The problem is that it needs to do that in the destructor. And we cleared the parent before the destructor was run. Technically speaking, reverting is the correct thing to do, since the parent *still* exists when the child is deleted.
| | * | qregext filter changed to support additional parameter/unicodeMatthew Cattell2009-08-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed the QRegExp filter back to the old form plus an additional piece to allow international characters. the new regular expression now allows a file type filter to contain a bracketed description prior to the filter set itself. 259105 Andy Shaw
| | * | Added the license header to the example.Denis Dzyubenko2009-08-042-0/+82
| | | |
| | * | Add QWeakPointer::data, which thread-unsafely returns the tracked pointerThiago Macieira2009-08-042-2/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function allows one to retrieve the pointer out of a QWeakPointer without promoting it to QSharedPointer first. That means there are no guarantees that the object won't get deleted. Reviewed-by: Bradley T. Hughes
| | * | Reorganise QObjectPrivate so that it's easier to tell what's in it.Thiago Macieira2009-08-043-70/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename QDeclarativeData to QObjectDeletionNotification, since it has no relation to declarative UI. It's just notification of the object's deletion. Make the destructor non-inline and place it in qobject.cpp, so that the virtual table is emitted there and exported from QtCore. Also move the QObjectData destructor to qobject.cpp. This means you cannot create any class deriving directly from QObjectData outside QtCore, which is the intention anyways (it's a private class and only QObjectPrivate derives from it). Reviewed-by: Bradley T. Hughes
| | * | Clean up old Jambi code: there's a way of getting the QObject d-pointerThiago Macieira2009-08-041-8/+1
| | | |
| | * | Don't try to make direct system calls on Linux.Thiago Macieira2009-08-043-99/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept that we cannot do everything, so users using outdated toolchains may have threading problems (leaking file descriptors). It's not like this is a recent problem anyway... Reviewed-By: Bradley T. Hughes
| | * | Removed the startPos/lastPos/pos from the gesture classes.Denis Dzyubenko2009-08-046-118/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It doesn't make much sense to have that low-level info neither in the base QGesture class, nor in the QPanGesture, as the latter one has offset properties instead. Reviewed-by: trustme
| | * | Removed the QTapAndHoldGestureDenis Dzyubenko2009-08-048-123/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the gesture implementation to the imageviewer example as it cannot be fully implemented in a crossplatform way - for example on Windows tap and hold is a system gesture that is transparent to the application. Reviewed-by: trustme
| | * | Moved the native window gesture handling code to the right place.Denis Dzyubenko2009-08-046-77/+121
| | | |
| | * | Renamed internal WinGesture event to NativeGesture.Denis Dzyubenko2009-08-047-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It will also be used on Mac, so it doesn't make sense to keep it windows specific. Reviewed-by: trustme
| | * | QNAM HTTP Code: Moved append() functions to the reply objectMarkus Goetz2009-08-044-36/+37
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | QHttpNetworkConnection: Moved channel slots to channel objectMarkus Goetz2009-08-045-267/+249
| | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * | Fix build on HarmattanTom Cooksey2009-08-041-4/+7
| | | |
generated by cgit v0.12 at 2025-01-17 03:50:30 (GMT)