summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "update the padnavigator example and suppress the padnavigator-ng"Thierry Bastian2009-05-228-150/+207
| | | | | | | | This reverts commit 1cad8c56002a61a6240e6580cdbd784209821fa6. Conflicts: examples/graphicsview/padnavigator/roundrectitem.cpp
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-22994-21504/+47602
|\ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro
| * Add properties to QGraphicsItem to change the transformations componentOlivier Goffart2009-05-227-44/+780
| | | | | | | | | | | | | | | | | | | | | | | | With the new properties it is possible to easily animate. Setting a transform using setTransform is incompatible with thoses properties. Accessing thoses propeties if you set previously a transform will give you the default values. Acknowledged-by: Code made with Andreas. Documentation written with Thierry. This still need a more in depth code review and documentation review. But it is urgent to commit now because the Animation API integration depends on it.
| * Enabled the use of promoted widgets in new form templates.Friedemann Kleint2009-05-226-124/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The form builder used for preview of the templates did not implement custom widget handling (FormBuilder::createCustomWidgets()). On encountering a promoted widget, the widget factory would then create a Widget Database entry specifying QWidget inheritance (emergency fallback) which could not be overidden later on. To fix this, moved the code for handling custom widgets from QDesignerResource to QSimpleResource and create a new formbuilder class that handles it especially for the New Form Dialog preview. Task-number: 254282
| * 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
| | | | * | Revert focus apparance on itemviews for X11Jens Bache-Wiig2009-05-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We changed this primarily for the mac as active appearance on widgets in itemviews should depend on the window activation state and not on the focus widget. It was explicitly added back for windows only but has been reported as a bug on X11 as well so we might as well keep it mac-only for now. Reviewed-by: mortens
| | | | * | Remove bad documentation about window modality and QMessageBox.Norwegian Rock Cat2009-05-201-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMessageBox is like QDialog. It doesn't have any extra magic with window modality on creation, so don't advertise that it does. The note about using message boxes as sheets is also updated.
| | | * | | qdoc: Moved a qdoc comment to a file that is in all packages.Martin Smith2009-05-203-4/+7
| | | |/ / | | | | | | | | | | | | | | | Task-number: 252565
| | | * | qdoc: I overwrote the commit template.Martin Smith2009-05-201-6/+8
| | | | |
| | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-202-15/+21
| | | |\ \
| | | | * | make QSslSocket test work also for shadow buildsPeter Hartmann2009-05-202-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... by being able to load the certificates also in a shadow build directory Reviewed-by: Thiago
| | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-2043-140/+245
| | | |\ \ \ | | | | |/ /
| | | | * | Fix a crash where QCocoaWindow get events after its widget is deadNorwegian Rock Cat2009-05-202-5/+19
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The invariant that QCocoaWindow's lifetime is contained in a QWidget is simply not true. A top-level QWidget gets associated with a QCocoaWindow (which is reference counted). However, it can be the case that we've destroyed our QWidget, the link is removed, the window is hidden, but the window still gets an event. In that case we would crash with an eventual null pointer access. However, we don't really need to do anything in this case, so just call super and return. Task-number: 253402 Reviewed-by: Morten Sørvig
| | | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-05-202-6/+12
| | | | |\
| | | | | * Fix parsing method calls with null arguments in Java codeEskil Abrahamsen Blomfeldt2009-05-201-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Java, "null" is represented as a keyword, not as the integer 0. The old code assumed the latter. Code such as translate("fooBar", "fooBar", null); would thus not be detected by lupdate when parsing Java files. Reviewed-by: ossi
| | | | | * Fix a typo in the class documentation for QItemDelegateAndy Shaw2009-05-201-1/+1
| | | | | |
| | | | * | Fix incorrect copyright year in some license headers.Jason McDonald2009-05-2011-11/+11
| | | | |/ | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * Optimize QIoDevice::readAll() to possibly do less (re)allocationsMarkus Goetz2009-05-201-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart Reviewed-by: Peter Hartmann Reviewed-by: João Abecasis
| | | | * Fixes a memory leak in the interbase sql driver.Bill King2009-05-201-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As suggested in gitorius merge request 421, solution supplied by Harald. Reviewed-by: Harald Fernengel
| | | | * Added auto-test for QComboBox::setItemDelegate and task 253944Stian Sandvik Thomassen2009-05-201-0/+24
| | | | |
| | | | * Adds thread initialisation/cleanup code to mysql.Bill King2009-05-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows for cleaner multi-thread working for mysql clients. Task-number: 253407
| | | | * Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to ↵Ariya Hidayat2009-05-194-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.5 ( 40b523e9eaaba38c182e5a9c319f0069ebf98330 ) Changes in WebKit since the last update: ++ b/WebCore/ChangeLog 2009-05-11 Yael Aharon <yael.aharon@nokia.com> Reviewed by Holger Freyther. Change Qt port to match the mac and windows ports, and unregister plugins when plugins are stopped. Not doing that can cause assersion failure. https://bugs.webkit.org/show_bug.cgi?id=25702 * plugins/qt/PluginViewQt.cpp: (WebCore::PluginView::stop):
| | | | * Revert commit a372fc602a3cb09379875ced99ec969c371917d7.Ariya Hidayat2009-05-196-695/+1645
| | | | | | | | | | | | | | | | | | | | This was accidentally committed.
| | | | * Mentioned the new fancy browser example in the changes-4.5.2.Ariya Hidayat2009-05-191-0/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | | * Updated WebKit from /home/ariya/dev/webkit/qtwebkit-4.5 to ↵Ariya Hidayat2009-05-196-1645/+695
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | origin/qtwebkit-4.5 ( 7b8d6ab6f2b73862d11c2a41ab0223e55585d88f ) Changes in WebKit since the last update:
| | | * | qdoc: Moved qdoc comments from qmacstyle_mac.mm to qstyles.qdocMartin Smith2009-05-203-160/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .mm file is not read by qdoc for packages other than for the MAC. This problem is overcome by moving the qdoc comments from the .mm file to a .qdoc file in doc/src, because all these files are read by qdoc for each of the packages. #Task-number: 252566
| | * | | Doc: Fixed the paper sizes again.David Boddie2009-05-201-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 254179 Reviewed-by: Norwegian Rock Cat
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-190-0/+0
| | |\ \ \
| | * | | | Doc: Added information about the third-party MD4, SHA-1 and DES code.David Boddie2009-05-191-54/+82
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2024-10-26 03:14:52 (GMT)