summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove ResolveFetchObject instructionAaron Kennedy2009-05-264-39/+9
|
* Remove AssignValueSource instructionAaron Kennedy2009-05-264-43/+5
|
* Unify the store instructions into the main VME switchAaron Kennedy2009-05-263-273/+249
|
* Remove AssignObject instructionAaron Kennedy2009-05-266-142/+85
|
* Remove Try*Object instructionsAaron Kennedy2009-05-264-83/+27
|
* Ensure tests passAaron Kennedy2009-05-266-30/+40
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-2686-1332/+3147
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Always treat CSS-like suffix's as bindingsAaron Kennedy2009-05-261-1/+5
| |
| * roberto: Added support for CSS like numeric literals e.g. 10pAaron Kennedy2009-05-2614-35/+624
| |
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-2652-846/+715
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Test cleanup.Michael Brasser2009-05-2549-841/+701
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-252-4/+13
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Fix compile when paint engine debugging is on.Michael Brasser2009-05-251-1/+1
| | | |
| * | | Move canvas scene snapshot out of in-process debuggerAaron Kennedy2009-05-2618-381/+449
| | | |
| * | | Add basic client/server debugging supportAaron Kennedy2009-05-2517-158/+1452
| |/ / | | | | | | | | | The canvas framerate monitor now uses this support.
* | | correct path docWarwick Allison2009-05-251-3/+0
| | |
* | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-05-252-4/+13
|\ \ \ | | |/ | |/| | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Disable QmlDom debug output by defaultKai Koehne2009-05-251-4/+10
| | | | | | | | | | | | Only print AST if QML_COMPILER_DUMP is set
| * | Merge branch 'kinetic-declarativeui' of ↵Julian de Bhal2009-05-25271-5145/+6710
| |\ \ | | |/ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Update mkspecs for linux-g++-x11Julian de Bhal2009-05-251-0/+3
| | | | | | | | | | | | | | | | | | Change QMAKE_INCDIR_OPENGL and QMAKE_LIBDIR_OPENGL to QMAKE_INCDIR_OPENGL_QT and QMAKE_LIBDIR_OPENGL_QT so qmake will pick them up.
* | | Fix with "new" argc/argv.Warwick Allison2009-05-251-7/+7
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-243-2/+7
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Use the true metatype of attached properties in the compilerAaron Kennedy2009-05-223-2/+7
| |
* | Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-228-48/+418
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Add canvas framerate monitor applicationAaron Kennedy2009-05-224-2/+328
| |
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-22143-1227/+2970
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Store the type of the attached properties objectAaron Kennedy2009-05-224-46/+90
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-22271-5145/+6710
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/kernel/kernel.pri src/corelib/tools/tools.pri tools/qdoc3/htmlgenerator.cpp tools/qdoc3/htmlgenerator.h
| * | Merge commit 'origin/4.5'Samuel Rødal2009-05-206-12/+18
| |\ \
| | * | Fix a compile error on MSVC 64bits due to qhash casting a pointer.Thierry Bastian2009-05-201-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I tested it with 32 bits compilation and there is no warning any more. Task-number: 247325 Reviewed-by: ogoffart
| | * | Fix a wrong compiler define (was a typo).Ariya Hidayat2009-05-201-1/+1
| | | | | | | | | | | | | | | | The typo was in commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
| | * | Compile on Solaris with broken GL headers.Trond Kjernåsen2009-05-201-2/+5
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| | * | Make the range controls accessibleHarald Fernengel2009-05-201-0/+2
| | | |
| | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jedrzej Nowacki2009-05-2013-198/+342
| | |\ \
| | | * | Don't draw an arrow for toolbuttons that are text only and have a menu.Norwegian Rock Cat2009-05-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I made this change to make things look a bit better on the mac. However, a toolbutton with text only looks strange and as a bonus the arrow covers some of the text, which no one wants. It seems that similar consructions in Cocoa don't show the arrow for text button, so we shouldn't either. Task-number: 253339 Reviewed-by: Jens Bache-Wiig
| | * | | I made test more stable. There was no sens to check hardcoded size ofJedrzej Nowacki2009-05-201-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | header + file. Now test check only size of the real file content, assuming that it is rather boring (9,5MB of '\0'). It simply skip header. Reviewed by Peter Hartmann
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-05-2022-1221/+113
| |\ \ \ \
| | * | | | tst_QHttpNetworkConnection: Compile fixMarkus Goetz2009-05-201-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * | | | Sync the French addressbook tutorial with the English versionBenjamin Poulain2009-05-201-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry
| | * | | | Remove QDumper. It was used in a previous version of creator but is nowThierry Bastian2009-05-202-1158/+0
| | | | | | | | | | | | | | | | | | | | | | | | useless.
| | * | | | allow to debug QVariant of float typeThierry Bastian2009-05-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: ogoffart
| | * | | | Changing the addressbook tutorial so it doesn't leak.Daniel Molkentin2009-05-2015-31/+34
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Kavindra Palaraja <kavindra.palaraja@nokia.com>
| | * | | | Use a per object lock for signal/slotsOlivier Goffart2009-05-202-25/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That way we prevent the current possible race condition that may appears while touching signals slot while object are moved to different threads. For exemple, when we do sender->threadData->mutex->lock(); the sender can possibly be moved to another thread between the moment we get the pointer to the threadData and the moment we aquire the lock. We could check if we locked the right mutex and retry otherwise, but that would break if the threadData (and hence the mutex) get destroyed in between. The per object mutex is implemented with a thread pool. I'm not using the global QThreadPool because we might ends up locking two of their mutex, and that would be dangerous if something else holds a lock on the same mutex (possible deadlock) Putting the mutex pool in a Q_GLOBAL_STATIC doesn't work as it might result of the ppol being deleted before some other object in others Q_GLOBAL_STATIC structures There is no need to lock this mutex in moveToThread as this is safe. When emiting a signal, we do not need to lock the thread data, as the user must ensure that the object is not moved to a thread while emiting a AutoConnection signal. Reviewed-by: Brad
| * | | | | Doc: Used QApplication::translate() instead of QObject::tr().David Boddie2009-05-204-8/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some point, we may revise this to use plain C strings at first, then introduce the concept of translations. Reviewed-by: Trust Me
| * | | | Doc: Compile fixes for tutorial examples.David Boddie2009-05-204-20/+21
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-2036-293/+518
| |\ \ \ \
| | * \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-2035-231/+441
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-205-22/+27
| | | |\ \ \
| | | | * | | QComboBox: style change event should not resets custom item delegatesOlivier Goffart2009-05-202-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression from 4.4 introduced while fixing task 167106 Autotest: tst_QComboBox::task253944_itemDelegateIsReset() Task-number: 253944 Reviewed-by: jbache
| | | | * | | Silence warning by MSVC.Frans Englich2009-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe