summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* More qpixmap*.cpp fixes for QExplicitlySharedDataPointer.Jason Barron2009-08-212-3/+3
| | | | Hopefully this fixes the remaining issues.
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-08-21207-2674/+5187
|\
| * Fix qpixmap*.cpp after latest QExplicitlySharedDataPointer changes.Jason Barron2009-08-204-18/+18
| | | | | | | | | | static_cast'ing this pointer type is not possible. You must call data() or constData() to get the actual pointer to cast.
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-203-1/+5
| |\
| | * Fix build error when Q_WS_S60 is undefinedIain2009-08-202-1/+3
| | | | | | | | | | | | Reviewed-by: Jason Barron
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-08-20154-2426/+4964
| | |\
| | * | Fix build problem when Q_WS_S60 is undefinedIain2009-08-201-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: Jason Barron
| * | | Fix errors in commit d4c0be3bShane Kearns2009-08-202-3/+3
| | |/ | |/| | | | | | | Reviewed-By: jbarron
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicShane Kearns2009-08-20178-2488/+4992
| |\ \
| | * | Make qregexp.cpp compile with RVCT.Jason Barron2009-08-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C++ standard says that templates do not consider non-exported operators, but most compilers ignore that rule. RVCT however, does not so add the Q_STATIC_GLOBAL_OPERATOR macro here which expands to 'inline' for RVCT instead of 'static'. Reviewed-by: Harald Fernengel
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-2030-145/+114
| | |\ \ | | | |/
| | | * compile when bootstrapping QtHarald Fernengel2009-08-201-0/+2
| | | |
| | | * Use QExplicitlySharedDataPointerHarald Fernengel2009-08-204-18/+10
| | | | | | | | | | | | | | | | ... instead of QScopedSharedPointer
| | | * Use QExcplicitlySharedDataPointerHarald Fernengel2009-08-206-20/+14
| | | | | | | | | | | | | | | | Getting us closer to removing QScopedSharedPointer
| | | * Use QExplicitlySharedDataPointer wherever possibleHarald Fernengel2009-08-2012-94/+77
| | | | | | | | | | | | | | | | Remove QScopedSharedPointer, this class will go soon.
| | | * Use QExplicitlySharedDataPointerHarald Fernengel2009-08-203-7/+6
| | | | | | | | | | | | | | | | part of the task to get rid of QScopedSharedPointer
| | | * Add missing template typedefsHarald Fernengel2009-08-201-0/+4
| | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | | * Fix Q_DECLARE_SHARED macroHarald Fernengel2009-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason, gcc was not picking up the qSwap specialization. Removing the explicit template call made it work. Reviewed-by: Thiago
| | | * Remove dead code.Frans Englich2009-08-202-5/+0
| | | | | | | | | | | | | | | | Addresses review comment.
| | * | Fix opengl examples after bad merge.Jason Barron2009-08-204-28/+79
| | | | | | | | | | | | | | | | | | | | | | | | Not sure when it happened, but these files were changed as a result of a merge conflict and at this point there should be no difference in these examples between the Qt/S60 and Qt master branches.
| | * | Merge commit 'qt/master'Jason Barron2009-08-20144-2315/+4798
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
| | | * QNAM HTTP: New attribute, Demo browser: Some request statistic outputMarkus Goetz2009-08-208-8/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New output that tells if a QNetworkReply was retrieved by using HTTP pipelining. The demo browser now shows some (debug) output about usage of cache, pipelining and SSL. Reviewed-by: Prasanth
| | | * This variable is used to signal a thread to exit. It should be volatile.Thiago Macieira2009-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a long stretch, but it could happen that the compiler optimises out the checking of the variable because it could not change synchronously. In any case, it's best to set it to volatile to ensure that all architectures reload properly (memory ordering semantics) Reviewed-by: Alexis Menard
| | | * Autotest: this test is not passing: so show that.Thiago Macieira2009-08-201-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that this the test is running into a false positive. It thinks it's ok, but it isn't. So show the problem.
| | | * Autotest: remove unreliable test.Thiago Macieira2009-08-201-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test required Qt to be built in debug mode. But there's no way of checking that from the autotest: some of our test machines build Qt in release mode but the tests in debug mode. So we don't test the Q_ASSERT.
| | | * Cocoa: cannot quit applicationRichard Moe Gustavsen2009-08-201-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Qt is used from within a native cocoa application. This patch allowes the application to terminate if we have no current event loops running. This should be safe in itself, and also handle the case where NSApp run is called from outside Qt. Task-number: 259928 Reviewed-by: msorvig
| | | * Improved support for SVG animation.Kim Motoyoshi Kalland2009-08-204-93/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for from-by-animation and by-animation in the animateTransform element. Updated bubbles.svg in the svgviewer example to make it work like intended with the corrected animation code. Task-number: Partially fixes 254784 Reviewed-by: Trond
| | | * Fixed crash in QtSvg caused by division by zero in animation code.Kim Motoyoshi Kalland2009-08-201-4/+7
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| | | * Fix for SVG animate-transform when additive = "replace".Suneel BS2009-08-203-19/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On animate transform if additive = "replace" then transform specified with the element should be replaced with value of animateTransform. If additive = "sum" , then apply the animateTransform on top of element level transform. Reviewed-by: Kim
| | | * Changed QSvgPaintEngine::drawImage() to ignore aspect ratio.Kim Motoyoshi Kalland2009-08-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When calling drawImage(), you expect the entire target rectangle to be filled, but an SVG user agent preserves the source image's aspect ratio by default. This fix explicitly turns off preservation of aspect ratio. Task-number: 257052 Reviewed-by: Trond
| | | * QNetworkRequest: Doc fixMarkus Goetz2009-08-201-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * Dont create native window handles when setting up gestures.Denis Dzyubenko2009-08-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently setting WA_DontCreateNativeAncestors and WA_NativeWindow attributes on widgets introduces painting artifacts. Temporary removing these attributes until there is a proper fix (those attributes will not be needed after the next gesture api improvement). Reviewed-by: trustme
| | | * Fix warning and potential infinite recursion.Olivier Goffart2009-08-201-1/+2
| | | | | | | | | | | | | | | | | | | | The code where the infinite recursion could appears should only be called by code generated by very old version of moc
| | | * Fix potential Infinite recurstion.Olivier Goffart2009-08-201-3/+2
| | | | | | | | | | | | | | | | | | | | Was introduced by commit 919b723 This function is not even supposed to be called anymore by anything
| | | * QListView refactor: we now have an interface for the 2 view modesThierry Bastian2009-08-204-628/+586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now we have 2 real implementations for listviews and iconviews This is a big refactor but the behaviour is kept. It also fixes a crash that could occur in setPositionForIndex while in ListMode. Acknowledged-By: ogoffart
| | | * Removed warning about signal conflicts.Friedemann Kleint2009-08-201-4/+0
| | | |
| | | * Designer: Tab widget / stacked widget / tool box pages got localized names.Friedemann Kleint2009-08-201-3/+3
| | | | | | | | | | | | | | | | Task-number: 259918
| | | * Move "Layout in Splitter" commands to their right placeJarek Kobus2009-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | RevBy: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task: 259785
| | | * Flickering "Whatsthis" pointer in CocoaPrasanth Ullattil2009-08-204-1/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since mouse tracking is always enabled on all QCocoaView-s, we are getting mouseMoved events for both parent and child (if mouse is over the child). In such cases the mouseMoved events are ignored for the parent view. We are using the native NSCursor stack for setting the override cursor. The current implementation for changeOverrideCursor is modified to keep this stack in sync with Qt's internal list. Task-number: 258173 Reviewed-by: Morten Sorvig
| | | * QNAM HTTP Code: Compile fix 2Markus Goetz2009-08-201-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | Those @$#! ifndefs. Reviewed-by: TrustMe
| | | * compile fix for WindowsJoerg Bornemann2009-08-201-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * Fixed an assert in debug mode when drawing text with theTrond Kjernåsen2009-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GL 2 engine on embedded. Worked in release because we don't really use any internals in QDataBuffer that sets the internal size correctly. Reviewed-by: Samuel
| | | * QNAM HTTP Code: Compile fixMarkus Goetz2009-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Build was broken when Qt3 support stuff was not enabled Reviewed-by: TrustMe
| | | * Autotest: add one more check for operator==Thiago Macieira2009-08-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm running out of ideas as to why MSVC.NET 2003 cannot do this test: baseptr == aData If I do baseptr.data() == aData, it works. And the operator== that it should be calling does exactly that. So my only clue so far is that it's calling some other operator== -- which doesn't make sense, since there is no other.
| | | * Remove a few warnings when compiling Qt and unexport some functions.Thiago Macieira2009-08-2011-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make some functions static that are not used anywhere but in the current file. Others that are used, add the declaration to the _p.h to ensure we don't forget about them. Finally, there's no need to enable debugging code if it's not used anywhere. Reviewed-by: TrustMe
| | | * Fix literal IPv6 hostname resolution in QHostInfo.Thiago Macieira2009-08-204-20/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the series of commits ending in ff1280178, I made QUrl::toAce fail if the parameter is not a well-formed hostname (i.e., if it violates STD3). IPv6 hostnames do, so we can't preemptively run ToACE. Instead, delay running ToACE until we've tried literal matching. Reviewed-by: TrustMe
| | | * Performance issue in QGraphicsItem::addParentItem while building theGabriel de Dietrich2009-08-204-12/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scene bottom-up. When adding n items, the depth was computed n² times. Adding lazy computation fixes this performance issue. Reviewed-by: Andreas
| | | * Fix QVariant::toFloat() and QVariant::toRealOlivier Goffart2009-08-203-3/+40
| | | | | | | | | | | | | | | | Reviewed-by: Thierry
| | | * Windows CE compile fixJoerg Bornemann2009-08-201-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: ariya
| | | * QNAM HTTP PipeliningMarkus Goetz2009-08-2014-52/+519
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP Pipelining should improve the performance of HTTP requests for high latency network links. Since some servers/proxies could have problems with it, it is disabled by default. Set the HttpPipeliningAllowed attribute of a QNetworkRequest to enable it for that request. Reviewed-by: Thiago