summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-206-17/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QGraphicsItem::hasFocus() performance regression. Fix crashes in QByteArray Move the labels a bit down so that they align better vertically with the field. Add command to qmake to do symbian-uid generation Fixed QBitmap::load to load into bitmap format again. Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers. Text drawing is not fast currently
| * QGraphicsItem::hasFocus() performance regression.Bjørn Erik Nilsen2010-01-201-1/+8
| | | | | | | | | | | | | | | | Problem was that we always climbed the parent chain to look for a panel item (QGraphicsItem::isActive()) before checking the scene's focus item. Task-number: QTBUG-6749 Reviewed-by: alexis
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Jan-Arve Sæther2010-01-201-2/+2
| |\
| | * Fix crashes in QByteArrayOlivier Goffart2010-01-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QByteArray is was crashing on linux 64bit. The memory was freed twice, once by qRealloc, and one by QScopePointer::reset This patch will leak if qRealloc fails because of OutOfMemory. But we do not care as it is a corner case. Reviewed-by: Harald Fernengel Reviewed-by: Robert Griebl
| * | Move the labels a bit down so that they align better vertically with the field.Jan-Arve Sæther2010-01-201-3/+3
| |/ | | | | | | | | | | | | This was a "showstopper" for QFormLayout being used in Qt Creator. Task-number: QT-958 Reviewed-by: Michael Goddard
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2010-01-203389-4766/+6728
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-01-201-1/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.
| | | * Fixed a crash under X11 when drawing QPixmaps to QGLPixelBuffers.Trond Kjernåsen2010-01-201-1/+5
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7476 Reviewed-by: Kim
| * | | Fixed QBitmap::load to load into bitmap format again.Gunnar Sletta2010-01-201-7/+14
| | | | | | | | | | | | | | | | | | | | Task: http://bugreports.qt.nokia.com/browse/QTBUG-7468 Reviewed-by: Trond
| * | | Text drawing is not fast currentlyGunnar Sletta2010-01-151-3/+0
| | | |
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-01-2011-28/+74
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (115 commits) Avoid calling WSAGetLastError() so often in nativeWrite Cocoa: Fix painting errors on QGLWidget resizing. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( e15bd5454732bab9ffff4e1e5a755f41fd4e2eff ) fix qm generation under windows More changelog additions for QtWebKit Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa ) fixes MMF plugin for Phonon when buidling with WINSCW Update my changelog for 4.6.1 My changes for 4.6.1 doc: Corrected parameter value in snippet. doc: This bug wasn't really a bug; it just required clarification. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 ) Polish the changes file. Copy changes file from 4.6 branch. Changed log updated Update change log with Yoann Lopes work. Update changelog with some of my stuff fix sametext and number heuristics my 4.6.1 changelog contributions Added changelog entries. ...
| * | | | Avoid calling WSAGetLastError() so often in nativeWriteMarkus Goetz2010-01-201-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: joao
| * | | | Cocoa: Fix painting errors on QGLWidget resizing.Morten Johan Sørvig2010-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Enable the patch in my previous commit. (remove "if 0")
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ↵Simon Hausmann2010-01-209-24/+70
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ( e15bd5454732bab9ffff4e1e5a755f41fd4e2eff ) Changes in WebKit/qt since the last update: ++ b/WebKit/qt/ChangeLog 2009-11-19 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> Reviewed by Kenneth Rohde Christiansen. [Qt] Fix QWebInspector destruction problem. https://bugs.webkit.org/show_bug.cgi?id=31664 * Api/qwebpage.cpp: (QWebPage::~QWebPage):
* | | | 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().
generated by cgit v0.12 at 2025-01-09 14:28:15 (GMT)