summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Relationship of QGraphicsObject::parent && QObject::parentKai Koehne2009-10-231-2/+2
| | | | | | | | | | | QGraphicsObject::parent is actually about the QGraphicsItem hierarchy, not the QObject hierarchy. This is similar to QGraphicsWidget, where 'QObject::parent() should always return 0'. Maybe the explanation in QGraphicsWidget class documentation on this topic should be merged into QGraphicsObject, too? Reviewed-by: Andreas Aardal Hanssen
* Fix bad check for GCC version.Thiago Macieira2009-10-231-1/+1
| | | | | | These macros are available since GCC 2.95. Reviewed-by: Olivier Goffart
* fix line endingOswald Buddenhagen2009-10-231-1/+1
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-231440-15891/+42346
|\
| * Better sql unicode tests (still not working correctly tho).Bill King2009-10-232-11/+9
| |
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Kurt Korbatits2009-10-221464-16003/+43818
| |\
| | * Store DirectFB winID as a dynamic propertyAnders Bakken2009-10-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since QWS uses the winids for its own purposes I have to store this as a dynamic property. _q_DirectFBWindowID The _q_ is documented to be reserved so this won't break anyone's applications. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * Compile fix for gestures on Windows.Denis Dzyubenko2009-10-221-4/+4
| | | | | | | | | | | | Reviewed-by: trustme
| | * Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Should be overwritten when the final patch of this bug hits trunk: https://bugs.webkit.org/show_bug.cgi?id=30671 Patch-by: Janne Koskinen Reviewed-by: Jocelyn Turcotte
| | * Temporary fix in qt.git to allow build on s60.Jocelyn Turcotte2009-10-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Should be overwritten when the final patch of this bug hits trunk: https://bugs.webkit.org/show_bug.cgi?id=30670 Patch-by: Janne Koskinen Reviewed-by: Jocelyn Turcotte
| | * Re-apply change 0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b by Martin SmithMartin Smith2009-10-221-1/+1
| | | | | | | | | | | | doc: Changed Trolltech to Nokia
| | * Re-apply change 8e0fbc2caa3edefb78d6667721235b783bc1a850 by IainIain2009-10-221-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Temporary workaround to get WebKit to pick up DEF file from std location Tweak WebCore .pro file to get its DEF file from the same location as all the other DEF files come from Reviewed-by: TrustMe
| | * Re-apply change 6b8ac349b9a477863a8c8388dcc0658f3284bc54 by Jocelyn TurcotteJocelyn Turcotte2009-10-221-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-applying commit ee0a43fee20cc398b505eb65218ebed56dfc8f39 by Simon Hausmann Fix crash of QtScript on Mac OS X When compiling on 10.4 but running on 10.5 the flags passed to vm_map cause it to crash. For now fall back to the use of mmap() as allocator instead. Reviewed-by: Kent Hansen
| | * Updated WebKit from /home/jturcott/dev/webkit/ to ↵Jocelyn Turcotte2009-10-221270-11675/+33732
| | | | | | | | | | | | | | | | | | | | | qtwebkit-4.6-snapshot-22102009 ( 0639bb8e812c8923287cd5523248ca64fa5f7a50 ) Changes in WebKit/qt since the last update: Jocelyn: fatal error from script, sha1 in src/3rdparty/webkit/VERSION is bad
| | * Update mkdist-webkit script with latest tag.Jocelyn Turcotte2009-10-221-1/+1
| | | | | | | | | | | | Not-reviewed: No-big-deal
| | * Remove declaration of QDirectFBScreen::scrollAnders Bakken2009-10-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This function has been declared since the initial commit but was never actually implemented. The function exists in QDirectFBWindowSurface. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * Compile fix.Denis Dzyubenko2009-10-226-38/+38
| | | | | | | | | | | | | | | | | | | | | QPanGesture was changed to use QPointF instead of QSizeF, also need to change all usages of the pan gesture. Reviewed-by: trustme
| | * QTextEdit: Fix the wrong order for call of Qt::WA_InputMethodEnabled in ↵Liang QI2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | setReadOnly. Should set Qt::WA_InputMethodEnabled after set the flags, just because shouldEnableInputMethod() will read the flags. Task-number: QTBUG-4917 Reviewed-by: Shane Kearns
| | * QHttp: Fix bug related to SSL and big POST dataMarkus Goetz2009-10-223-7/+67
| | | | | | | | | | | | | | | | | | | | | | | | QHttp is deprecated, but let's be nice and fix this. POST/PUT now properly works over HTTPS without buffering the whole data when it is not needed. Reviewed-by: Peter Hartmann
| | * QSslSocket: Trigger a SSL transmission when reading from the socket.Markus Goetz2009-10-224-0/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | In certain cases a SSL transfer stalled when a readBufferSize was set. This change triggers a SSL transmission when there is data on the socket waiting to be decrypted. Task-number: QTBUG-3860 Reviewed-by: Thiago
| | * Make warning more helpful.Thomas Zander2009-10-221-1/+1
| | | | | | | | | | | | Also fix grammer and avoid using combined words.
| | * Change API; the pan gesture now has points for distance, not size.Thomas Zander2009-10-224-24/+24
| | |
| | * Make the already-public calls be documented and publicThomas Zander2009-10-222-3/+2
| | |
| | * Fixed the gestures/graphicsview manualtestDenis Dzyubenko2009-10-222-4/+23
| | |
| | * Implemented gesture event delivery and propagation inside QGraphicsView.Denis Dzyubenko2009-10-223-38/+350
| | | | | | | | | | | | Reviewed-by: Thomas Zander
| | * Added debug operator for QGraphicsObjectDenis Dzyubenko2009-10-222-0/+18
| | | | | | | | | | | | Reviewed-by: Alexis Menard
| | * Add QGestureEvent::mapToScene for better graphicsView integrationThomas Zander2009-10-224-0/+50
| | |
| | * Fix for the gestures autotest.Denis Dzyubenko2009-10-222-9/+8
| | | | | | | | | | | | Reviewed-by: trustme
| | * Improvements for gesture event deliveryDenis Dzyubenko2009-10-227-42/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | When delivering GestureOverride events by default both the event and individual gestures will be ignored. We also store the acceptance state of individual gesture in the event and not in the gesture object, along with its target. Reviewed-by: Thomas Zander
| | * Improving gesture event delivery for widgets.Denis Dzyubenko2009-10-225-89/+324
| | | | | | | | | | | | Reviewed-by: trustme
| | * Fixed gesture event delivery when several gestures are triggered.Denis Dzyubenko2009-10-223-29/+59
| | | | | | | | | | | | | | | | | | | | | | | | When there are two different gestures are being triggered and they are supposed to be sent to different widgets, don't stop event "propagation" when the first event is successfully delivered. Reviewed-by: trustme
| | * Improved gesture event filtering inside QGraphicsView for QGraphicObjectsDenis Dzyubenko2009-10-2213-185/+372
| | | | | | | | | | | | Reviewed-by: trustme
| | * Extended an autotest for gestures.Denis Dzyubenko2009-10-221-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | Make sure that when a gesture recognizer explicitely sets the targetObject to a QGraphicsObject, we deliver it only to the object and will not try to propagate. Reviewed-by: trustme
| | * Changed qsrand() behavior for Windows to match the linux versionninerider2009-10-221-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | A problem occurred related to the createUUid function on Windows Mobile. Calling rand() before srand() resulted in identical pseudo random sequences for different threads. Reviewed-by: Joerg
| | * Description: Auto test fixes for Windows Mobile platformninerider2009-10-221-5/+43
| | | | | | | | | | | | Reviewed-by: Joerg
| | * Use the qsreal type instead of double when working with QtScript numbersKent Hansen2009-10-224-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | The idea is that qsreal can be typedef'ed to float on platforms where it's appropriate. Since the QScriptValue ctor takes a qsreal, we should not convert it to a double internally. Reviewed-by: Olivier Goffart
| | * Add Windows 7 with VC++2008 as a Tier 2 supported platform.Volker Hilsheimer2009-10-221-2/+0
| | |
| | * Merge branch 'origin/4.6' into widgets-team/4.6Olivier Goffart2009-10-22147-3860/+8128
| | |\
| | | * QtScript: Compatibility with 4.5Olivier Goffart2009-10-222-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We must register the same type as they were registered in Qt 4.5 Reported on qt4-preview-feedback mailing list. Reviewed-by: Kent Hansen
| | | * Qt patches to libpng sources.aavit2009-10-221-2/+12
| | | | | | | | | | | | | | | | | | | | This commit is the combination of earlier Qt patches to libpng, reapplied here after the upgrade to 1.2.40.
| | | * Upgrade libpng to version 1.2.40aavit2009-10-2286-3626/+6428
| | | | | | | | | | | | | | | | | | | | This commit contains a clean copy of the libpng source distribution. The Qt patches will follow in a separate commit.
| | | * qfiledialog2 added to tests/auto/auto.proJoerg Bornemann2009-10-221-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: alexis
| | | * qfontengine_win.cpp: special Windows CE code removedJoerg Bornemann2009-10-221-75/+16
| | | | | | | | | | | | | | | | Reviewed-by: thartman
| | | * consider message id when comparing messagesOswald Buddenhagen2009-10-222-2/+12
| | | |
| | | * id-based: do not drop unfinished untranslated messagesOswald Buddenhagen2009-10-221-1/+1
| | | | | | | | | | | | | | | | otherwise the fallback to use the source string is rather pointless
| | | * id-based: use source strings instead of empty translations only for ↵Oswald Buddenhagen2009-10-222-3/+5
| | | | | | | | | | | | | | | | unfinished messages
| | | * actually guess the target language from the file nameOswald Buddenhagen2009-10-221-0/+2
| | | | | | | | | | | | | | | | --help says it does, but it didn't really.
| | | * QDom autotests: make test fail instead of time outPeter Hartmann2009-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | introduce a QFAIL for now until problem is fixed Reviewed-by: Carlos Duclos
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Friedemann Kleint2009-10-2241-138/+1581
| | | |\
| | | | * Fix a bug in QGraphicsRotation related to 2D projectionsRhys Weatherley2009-10-223-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The projection to 2D needs to be done when the rotation is applied, not after all transformations have been applied. Reviewed-by: trustme
generated by cgit v0.12 at 2025-02-03 20:52:52 (GMT)