summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-09-036-91/+269
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-031-0/+1
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
| * | Add QML enum supportAaron Kennedy2009-09-036-19/+155
| | | | | | | | | | | | | | | | | | Enums are accessed as <Type Name>.<Enum value name> Currently this is highly unoptimal - enum assignments are not detected in the compiler, nor are they cached in the script engine.
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-021-2/+5
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
| * \ \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-0211-68/+154
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt Conflicts: demos/declarative/samegame/content/samegame.js
| * \ \ \ Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-0273-665/+1120
| |\ \ \ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt
| * | | | | Rework script binding methodAaron Kennedy2009-09-022-81/+123
| | | | | |
* | | | | | Fix a bug in the qmlvme, which lead to an assert on valid QML.Alan Alpert2009-09-033-0/+11
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As QmlComponents are created outside the CreateObject instruction, they could be created with an uninitalized declarative data member. Also this patch sets the column on CreateObject instructions too. Reviewed-by: Aaron Kennedy
* | | | | Add an assert before we dereference a null pointerAlan Alpert2009-09-021-0/+1
| |_|_|/ |/| | | | | | | | | | | Reviewed-by: Aaron Kennedy
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-025-64/+118
|\ \ \ \ | | |_|/ | |/| | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-09-0214-36/+64
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Provide some color manipulation functions.Michael Brasser2009-09-025-64/+118
| | | | | | | | | | | | | | | | | | | | | | | | | These may not be the final location for these, but it allows us to start testing.
* | | | | Disallow using typenames as idsAaron Kennedy2009-09-021-2/+5
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now illegal: import Qt 4.6 Item { id: Item } as is import Qt 4.6 Item { id: Text }
* | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-027-21/+28
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Fixed crash in keyPressed. keyToSignal function suppose to return “const ↵Mehul R. Patel2009-09-021-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | QbyteArray” not “const char *”. Crash was coming because keyPressed was getting invalid memory pointer from keyToSignal function. Merge-request: 1374 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * | | Flickable locked property changed to interactive.Martin Jones2009-09-026-16/+23
| | | | | | | | | | | | | | | | Note that the meaning of the property has been reversed.
| * | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-09-022-12/+1
| |\ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Clear animation only in the direction being fixed in fixupX/Y.Martin Jones2009-09-021-4/+4
| | |/ / | |/| |
* | | | Save object creation line and column numberAaron Kennedy2009-09-025-3/+35
| |/ / |/| | | | | | | | | | | This info is used by the debugger interface, and by the qmlInfo() stream.
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-09-0267-645/+1093
|\ \ \ | |/ / | | / | |/ |/| git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-0131-384/+557
| |\ | | | | | | | | | kinetic-declarativeui
| | * Rewrite of DirectFB locking mechanismAnders Bakken2009-09-019-92/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DirectFB allows you to have a locked subSurface that remains valid while you paint on the unlocked "parent" surface. The only limitation is that when accessing the locked memory you might have to call DirectFB->WaitIdle() in case pending GPU operations aren't finished. After this we keep the locked surface around at all times (from the first time it's requested) until the surface dies. Previous calls to lock() will just call WaitIdle if necessary and previous calls to unlock now just mark the surface as dirty and in need of a WaitIdle if someone needs to access its pixel data. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * Make DirectFB compile with Qt in a namespaceAnders Bakken2009-09-015-43/+38
| | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * Add DirectFB to QScreenDriverFactoryAnders Bakken2009-09-011-2/+7
| | | | | | | | | | | | Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | * Add directfb.pri to embedded.priAnders Bakken2009-09-011-0/+4
| | | | | | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * Copy directfb.pro to src/gui/embedded/directfb.priAnders Bakken2009-09-012-35/+41
| | | | | | | | | | | | Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * Don't check for null if never happens, but test it if it may...João Abecasis2009-09-011-4/+4
| | | | | | | | | | | | | | | | | | Making coverity happy. Reviewed-by: Olivier Goffart
| | * Don't seg-fault when printing error message in shader managerTom Cooksey2009-09-011-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | It's very likely that some of the shader objects in required program will be null, as not all are manditory. Check to see if they exist before de-referencing them and asking for their log string. Reviewed-by: Trustme
| | * Merge branch '4.5' into 4.6Thiago Macieira2009-09-014-24/+32
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessbackend.cpp src/network/access/qnetworkreplyimpl.cpp tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
| | | * Re-add check for saving to cache, which was removed by accident.Thiago Macieira2009-09-011-0/+1
| | | | | | | | | | | | | | | | Discussed with Ben Meyer.
| | | * QNetworkAccessManager can delete the QAbstractNetworkCache pointer atBenjamin C Meyer2009-09-014-21/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any point. Rather then keep a separate pointer to the cache in the reply use the pointer kept by the manager so the reply never tries to access a cache pointer that has already been deleted. Autotest: included Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | | * Initialize QNetworkAccessBackend's private variables to 0 in the constructorBenjamin C Meyer2009-09-011-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and when creating a CacheBackend set the manager pointer. Merge-request: 1124 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | QNAM HTTP Code: Removed unnecessary legacy loopMarkus Goetz2009-09-011-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | Thank you Coverity! Thank you Biochemist! Reviewed-by: joao
| | * | Speed-up parsing of SVG path data.Ariya Hidayat2009-09-011-117/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using operations that shuffle the array of numbers, just use pointer to iterate the numbers. This reduced the amount of memory operations during the parsing. In addition, parse the numbers to QVarLengthArray instead of QVector. This works well because usually a path element is typically followed by a short list of numbers. Loading tiger.svg (tests/benchmarks/qsvgrenderer) is now 8% faster, mostly due to the time spent in parsePathDataFast is reduced from 26.1 millions instructions to just 20.5 millions (27% speed-up). Reviewed-by: Kim
| | * | Use QStringRef when parsing SVG transformation matrix.Ariya Hidayat2009-09-011-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is really no need to use QString for parsing the matrix, hence use QStringRef. In a complex SVG, this cuts significantly the time spent in parseTransform(). Reviewed-by: Kim
| | * | Doc: Fixed typos in QGraphicsItem and Diagram Scene ExampleGeir Vattekar2009-09-011-14/+13
| | | | | | | | | | | | | | | | | | | | Task-number: 257292 Reviewed-by: Trust Me
| | * | Doc: Fixed outdated docs in QStyle::styleHint().Geir Vattekar2009-09-011-5/+3
| | | | | | | | | | | | | | | | | | | | Task-number: 256745 Reviewed-by: Trust Me
| | * | Unambiguated QGLFramebufferObject constructor on Mac OS X.Samuel Rødal2009-09-011-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trond
| | * | Define QT_NO_EXCEPTIONS if we detect that we are building without exceptions ↵Olivier Goffart2009-09-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on gcc This is necessary to compile applications that are compiled without exception support (many KDE applications) Reviewed-by: Thiago
| | * | QtNetwork: More Coverity fixesMarkus Goetz2009-09-013-1/+9
| | | |
| | * | Create exceptionCatch eventsJedrzej Nowacki2009-09-013-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Call to JSC::Debugger::exceptionCatch when exception is catched were added for JIT enabled. Few XFAIL were moved. Reviewed-by: Kent Hansen
| | * | Fix column number in QScriptEngineAgentJedrzej Nowacki2009-09-011-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix column number in QScriptEngineAgent with JIT enabled and in the same time with QT_BUILD_SCRIPT_LIB disabled Reviewed-by: Kent Hansen
| * | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-0137-261/+536
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: tools/qdoc3/test/classic.css
| | * | QTreeView: exapnding nodes just after replacing the model wouldn't workThierry Bastian2009-09-012-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that deleting the previous model would triggera delayed reset. This reset could happen after the model has changed and nodes are expanded. We can now cancel a reset when reset is called from another place (like when we set a new model). Note: autotest included Task-number: 245654 Reviewed-by: ogoffart
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-09-011-4/+13
| | |\ \
| | | * | Socket code: Do not use magic buffer size valueMarkus Goetz2009-09-011-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have seen a performance increase of around 30% for big file transfers on Linux when having high bandwidth and higher latency. Reviewed-by: Thiago
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-09-018-19/+37
| | |\ \ \ | | | |/ /
| | | * | Coverity: Small fix for QIODeviceMarkus Goetz2009-09-011-1/+6
| | | | |
| | | * | Fix rounding bug in QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-09-011-4/+5
| | | | | | | | | | | | | | | | | | | | The pixmap was painted at wrong offset.
| | | * | Make sure the BSP is updated when a graphics effect changes bounding rect.Bjørn Erik Nilsen2009-09-014-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of applying an effect to a QGraphicsItem, we have to notify the scene's BSP that the item's bounding rect has changed. We do this by calling prepareGeometryChange(). In the case of QWidget, it's sub-optimal that we update its parent, but there's no other way to solve it at the moment.