summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Implemented event filter functions for Symbian.axis2010-01-202-10/+43
| | | | | | | | | | Previously only the symbian specific event filters were called, but now all filters in QApplication, QAbstractEventDispatcher and QInputContext should be called. Task: QT-2629 RevBy: Jason Barron Autotest: Passed
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-202-18/+13
|\ | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Generic solution for plugin stub exports for IBY usage
| * Generic solution for plugin stub exports for IBY usageMiikka Heikkinen2010-01-202-18/+13
| | | | | | | | | | | | | | | | | | | | Previous s60installs specific fix was flawed in that it failed to generate exports when doing clean build. Replaced that with a more generic solution that exports plugin stubs under \epoc32\data\z always. Task-number: QTBUG-6972 Reviewed-by: Janne Anttila
* | QMetaObject::disconnectOne()Aaron Kennedy2010-01-203-7/+29
| | | | | | | | | | | | | | | | Adds a disconnectOne() method that allows a single signal/slot connection to be disconnected, as required by QTBUG-6781. Reviewed-by: Warwick Allison Reviewed-by: Olivier Goffart
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-1911-10/+34
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Memory leak in native Toolbar cleanup in Cocoa Fix copyright year. Bump version to 4.6.2. Add skeleton changes file for 4.6.2. Add released version of 4.6.1 changes file for posterity. Designer crashes when previewing QMainWindow with native Toolbar on Mac
| * | Memory leak in native Toolbar cleanup in CocoaNils Jeisecke2010-01-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | The QCocoaToolBarDelegate is not released when destroying the QMainWindowLayout. Task-number: QTBUG-7307 Reviewed-by: Prasanth Ullattil
| * | Fix copyright year.Jason McDonald2010-01-196-6/+6
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Bump version to 4.6.2.Jason McDonald2010-01-193-4/+4
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Designer crashes when previewing QMainWindow with native Toolbar on MacPrasanth Ullattil2010-01-191-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash happens when a QMainWindow with a native toolbar is reparented. While re-parenting, the QToolBar triggers a new setParent() with the MacWindowToolBarButtonHint. This messes up the internal state, hence the crash. To avoid re-entering setParent() for the QMainWindow, this hint is set depending on the unifiedTitleAndToolBarOnMac property. This patch also fixes a related issue in Cocoa, we need to remove the reused NSToolbar from the old window while recreating the QMainWindow. Task-number: QTBUG-7162 Reviewed-by: Richard Moe Gustavsen
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-193-15/+65
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make the qWarnings in the animation API more useful. Fixed y-inverted pixmaps on N900. Fix X11/EGL builds using OpenGL ES 1.1 Fix Typo
| * | Make the qWarnings in the animation API more useful.Alexis Menard2010-01-191-5/+12
| | | | | | | | | | | | | | | Task-number:QTBUG-6895 Reviewed-by:Thierry
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-191-6/+45
| |\ \
| | * | Fix X11/EGL builds using OpenGL ES 1.1Tom Cooksey2010-01-191-6/+45
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7399 Reviewed-By: TrustMe
| * | | Fixed y-inverted pixmaps on N900.Gunnar Sletta2010-01-191-4/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGLPixmapData used default bind options, which means that the pixmap is always flipped up-side-down and rendered with flipping. The opaque pixmaps were uploaded unflipped which caused the bug. Ideally we do not want pixmap flipping so change the default in gl pixmaps and tag it accordingly. Reviewed-by: Samuel
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-192-3/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QNativeSocketEngine windows: Fix performance degredation in write() Remove QtScript connection when receiver QObject has been deleted
| * | | QNativeSocketEngine windows: Fix performance degredation in write()Markus Goetz2010-01-191-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had an hack in the code that chunked writes. Try to avoid this since the hack is probably only needed for older windows versions. Task-number: QTBUG-7344 Reviewed-by: Peter Hartmann
| * | | Remove QtScript connection when receiver QObject has been deletedKent Hansen2010-01-191-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't want to have to listen to the destroyed() signal for every receiver object of a connection, and likewise we don't want to create a QObject to handle each connection; instead, remove the connection lazily at signal emission time after we've detected that the receiver has been deleted. Task-number: QTBUG-7313 Reviewed-by: Simon Hausmann
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-191-17/+28
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: use same small color dialog on S60 and Maemo 5 fix qm generation under windows
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-181-17/+28
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: use same small color dialog on S60 and Maemo 5 fix qm generation under windows
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-161-17/+28
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: use same small color dialog on S60 and Maemo 5 fix qm generation under windows
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-01-151-17/+28
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: use same small color dialog on S60 and Maemo 5 fix qm generation under windows
| | | | * | use same small color dialog on S60 and Maemo 5Harald Fernengel2010-01-151-17/+28
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Jason Barron
* | | | | | Enhance QFileNetworkReplyMarkus Goetz2010-01-184-65/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now considered as finished immediatly after creation to avoid an event loop spin. Had to change the auto tests a bit to account for the new behaviour. Reviewed-by: Peter Hartmann
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-183-56/+64
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QSslCertificate issues Change the prefered content size of the anomaly browser Avoid painting while loading in the anomaly demo browser QFile::readData: Simplify code If the file is open, there must be an engine. QFile: Fix a pre-mature pessimization don't assert when calling QtScript-wrapped method of deleted QObject
| * | | | | Fix QSslCertificate issuesMarkus Goetz2010-01-181-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thank you Matthew Cattell for the fix! Task-number: QTBUG-6466 Reviewed-by: joao
| * | | | | QFile::readData: Simplify codeJoão Abecasis2010-01-181-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | | | | If the file is open, there must be an engine.João Abecasis2010-01-181-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to allocate one for QFile::handle and QFile::flush since they'll be useless there. Reviewed-by: Markus Goetz
| * | | | | QFile: Fix a pre-mature pessimizationJoão Abecasis2010-01-181-44/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't repeatedly call the fileEngine virtual function. Instead re-use the private data member if we know it has been filled. Reviewed-by: Markus Goetz
| * | | | | don't assert when calling QtScript-wrapped method of deleted QObjectKent Hansen2010-01-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it behave the same as the old (4.5) back-end. Reviewed-by: Jedrzej Nowacki
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-189-13/+13
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Workaround for compiler error with MWCC (Symbian emulator) Describe patch-capabilities in the install instructions. Remove qmake warning by using appropriate variable. Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has changed /epoc32/include layout, including a subdirectory called "platform".
| * | | | | Workaround for compiler error with MWCC (Symbian emulator)Shane Kearns2010-01-188-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent changes to phonon and syncqt cause problems with the default search path for #include with this compiler. Reviewed-by: Gareth Stockwell
| * | | | | Remove qmake warning by using appropriate variable.axis2010-01-181-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | RevBy: Miikka Heikkinen
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-181-0/+10
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixes: When calling QDesktopWidget::screenGeometry() with a null
| * | | | Fixes: When calling QDesktopWidget::screenGeometry() with a nullAndy Shaw2010-01-181-0/+10
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointer then it should not crash but warn instead. Task: - RevBy: Andreas AutoTest: Included Details: This also fixes availableGeometry() as well to warn under the same circumstances.
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-181-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compilation on IA-64 with the Intel compiler: cast properly.
| * | | Fix compilation on IA-64 with the Intel compiler: cast properly.Thiago Macieira2010-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was: ../../include/QtCore/../../src/corelib/arch/qatomic_ia64.h(208): error: argument of type "QMutexPool *volatile *" is incompatible with parameter of type "void *volatile *" return (T *)_InterlockedExchangePointer(&_q_value, newValue); ^ detected during instantiation of "T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *) [with T=QMutexPool]" Patch by Intel Yolanda Chen (relayed by reporter Richard Fleck). Task-number: QTBUG-7356
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-151-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Avoid an unnecessary copy in QImage::scaled().
| * | | Avoid an unnecessary copy in QImage::scaled().Trond Kjernåsen2010-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This comes from the dark ages of Qt 3.x, where QImage was an explicitly shared class. Task-number: QTBUG-7231 Reviewed-by: Kim
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-151-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Doc: Added placeholder pages for new examples and updated the overviews. Fixes: Cosmetic fix for maemo spin box Adding texture glyph cache default.
| * | | Fixes: Cosmetic fix for maemo spin boxJens Bache-Wiig2010-01-151-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | Reviewed-by: rgriebl Description: We pass the wrong gtk style the the background. For most desktop styles this has no affect, but it breaks on Hildon.
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-155-5/+28
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enable surface transparency support on Symbian^4. Improve the behavior of expose events on Symbian.
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-155-5/+28
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enable surface transparency support on Symbian^4. Improve the behavior of expose events on Symbian.
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-01-145-5/+28
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Enable surface transparency support on Symbian^4. Improve the behavior of expose events on Symbian.
| | | * Enable surface transparency support on Symbian^4.Jason Barron2010-01-142-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Symbian^4 systems where the window supports surface transparency, we use this for the Qt::WA_TranslucentBackground flag instead of the previous method. Task-number: QT-2026 Reviewed-by: Iain
| | | * Improve the behavior of expose events on Symbian.Jason Barron2010-01-144-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when an expose was received from WSERV, we simply called BitBlt (for raster) or called flush on the window surface (for anything else). This behavior differs from other platforms which call syncBackingStore(). This difference means that we flush the backing store without actually updating the content first. This works for most cases because if there actually was new content, it would be updated when the widget's UpdateRequest event was handled. The problem arises when the backing store does not have the correct content. This can happen if the backing store was deleted, but only partially restored (see Task below). Another problem is with the OpenVG graphics system which assumes that beginPaint() is called before endPaint() is order to initialize the context and the surface size. The fix is to call syncBackingStore() like the other platforms, but introduce a bit field to prevent infinite recursion in the painting pipeline. Task-number: QTBUG-4921 Reviewed-by: axis Reviewed-by: Gareth Stockwell
* | | | Clarify the docs slightly for QPainter::beginNativePainting().Trond Kjernåsen2010-01-151-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some complain that we don't reset every GL state in the GL engine in endNativePainting(). We simply can't do that as it would be a performance bump. The user is responsible for setting states they themselves change in a begin/endNativePainting() block, back to their default state.
* | | | Fixed the encoding of the Tile and Creator tags in the PDF engine.Trond Kjernåsen2010-01-151-8/+18
|/ / / | | | | | | | | | | | | Task-number: QTBUG-7249 Reviewed-by: Kim
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-142-7/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QListView in icon view mode, drop enabled items wouldn't receive anything Fixes wrong stroke clipping with the raster engine.
| * | | QListView in icon view mode, drop enabled items wouldn't receive anythingGabriel de Dietrich2010-01-141-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QIconModeViewBase::filterDropEvent() was only moving the items around in the view without ever checking whether the cursor was over a drop enabled item. Now it does and returns false if it's the case. As a consequence, QAbstractItemView::dropEvent() gets called. No auto-test since it's a drag & drop related task. Reviewed-by: janarve Task-number: QTBUG-6848
| * | | Fixes wrong stroke clipping with the raster engine.Yoann Lopes2010-01-141-7/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | The problem was that the clip rect was only updated when the QPen had changed. Task-number: QTBUG-7253 Reviewed-by: gunnar