summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Bring qmetaobjectbuilder in sync with mocKent Hansen2012-02-033-2/+5
| | | | | | | | | | | | | | | | | | | qmetaobjectbuilder should generate meta-objects of the same version as moc; in the future, when the moc version is bumped, QMOB has to be adapted at the same time. QMOB was generating version 4 meta-objects. This patch makes it generate version 6 (the current version). This also fixes a bug with using qt_static_metacall with QMOB (setStaticMetacallFunction()); it was already using the version 6 qt_static_metacall signature, which isn't compatible with version 4. Also add tests that ensure that the QMOB-generated meta-object works with real objects; in particular we want to test the codepaths in Qt that check for version >= 4. Change-Id: I64a151ea5c947a6f8b7a00e85a39866446c735e9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Adapt QtDBus to QVariant property type changeKent Hansen2012-02-032-3/+3
| | | | | | | | | | Commit 00c8984b4e48b2a7eadfee6c3cd0cbb19f586118 changed other parts of Qt to use QMetaType::QVariant, not 0xff, as the type for QVariant properties. QtDBus should check for that type, and also use it for QDBusVariant properties. Change-Id: I21d81b59754ae44889766877a4c5066466b46d86 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Bring QtDBus meta-object generator in sync with mocKent Hansen2012-02-031-94/+54
| | | | | | | | | | | | | | | | | | | | | | QtDBus's meta-object generator should generate objects of the same version as moc; in the future, when the moc version is bumped, QtDBus's meta-object generator has to be adapted at the same time. Since QMetaObjectPrivate and related flags reside in qmetaobject_p.h, QtDBus can just include the header instead of duplicating code. qmetaobject_p.h also defines the meta-object revision QtDBus should be targeting. QtDBus was generating version 3 meta-objects. This patch makes it generate version 6 (the current version). Since a new field was added to QMetaObjectPrivate in revision 4 (signalCount), the generator had to be adapted. In particular, the signal definitions need to come before other methods (as they do with moc), since there are functions in QObject that rely on that (e.g. computeOffsets()). Change-Id: I37f102d8c1be372ef6cfaf013baa87f9abb0fd5e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation on MinGW.Friedemann Kleint2012-02-034-19/+15
| | | | | | | | | | | - Add missing constant. - Make FontKey a pair instead of a function-local type which cannot be used as template parameter for gcc. - Fix warnings about redefinition of NOMINMAX and enumeration. Change-Id: Ie3eb6e5b8dd9cd81210d6e10270ada0158aaf809 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Handle the 'real' datatype correctly in the SQLite driverAndy Shaw2012-02-031-0/+1
| | | | | | | | | | | | | | | The 'real' datatype should be seen as a QVariant::Double type and not as a QVariant::String type otherwise it does not get presented correctly when using a non Qt application to access it. Test is included for QSqlQuery. Task-number: QTBUG-16373 Change-Id: Ie323ce49eb95e4d6bb4c3814ba9a957a63f4b259 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> (cherry picked from commit b23631015c23a49e3b4d296ea0a6266bfce3d4f1) Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix a typo TypeDefiniton -> TypeDefinition.Jędrzej Nowacki2012-02-033-49/+49
| | | | | | | | If you repeat a typo often enough, it becomes the right spelling. But 49 times is definitely not enough :-) Change-Id: I7c0bb29e68e4bff5c67277f9874df8b3ab8b2b54 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Include qatomic_cxx11.h for C++11 compilersBradley T. Hughes2012-02-031-1/+1
| | | | | | | qatomic_cxx0x.h doesn't exist. Change-Id: Iac654ecf09a1b890d25fa23625c8c43f2f7f1ecf Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove empty src/corelib/arch subdirectoriesBradley T. Hughes2012-02-034-12/+0
| | | | | | | | | | The bfin, integrity, s390, and sh4a directories included an empty arch.pri, which is not necessary. Remove these directories and arch.pri files. Change-Id: I016dcef63e4b9fb4c14cc1fa7b9b91cba2080dbb Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/nacl/* and qatomic_nacl.hBradley T. Hughes2012-02-034-258/+0
| | | | | | | | | | This implementation uses the GCC __sync_* intrinsics, which we do not need to duplicate after commit 2bbd2262b3974fb4e39341a23e40ffdf1655ebe9 (which added qatomic_gcc.h). Change-Id: I59b6e4a03e83f58f4145a5ab2bfd635fe9ab686f Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/ia64/*Bradley T. Hughes2012-02-032-78/+0
| | | | | | | | | The out-of-line q_atomic_test_and_set_(int|ptr) functions are no longer declared after commit 1955353149781a064bc053b86be6e221b159d4ee. They appear to have never been used either. Remove them. Change-Id: Ia8dfa1f585f2370091b4fd93aaf98cb10241bf31 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/i386/* and src/corelib/arch/x86_64/*Bradley T. Hughes2012-02-036-303/+2
| | | | | | | | We do not want to support out-of-line QAtomic* implementations. Remove these from the i386 and x86_64 implementations. Change-Id: Ib6a9614b7b11bf6bccc9054b177357afd83e33e6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/avr32/* and qatomic_avr32.hBradley T. Hughes2012-02-034-258/+0
| | | | | | | | | This implementation uses the GCC __sync_* intrinsics, which we do not need to duplicate after commit 2bbd2262b3974fb4e39341a23e40ffdf1655ebe9 (which added qatomic_gcc.h). Change-Id: I2cab86deacad1c37f17f0c5836d9faf2ad366495 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/mips/*Bradley T. Hughes2012-02-033-296/+0
| | | | | | | | | Commit 99fb1bea49c4de5cf3143af59f8c96a92980e58f removed the use of the old, out-of-line q_atomic_* implementation. Remove these functions from the library. Change-Id: I0b239bf779e0545cb5558862e3a40f6e95fdcbd9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove src/corelib/arch/arm/*Bradley T. Hughes2012-02-032-76/+0
| | | | | | | | | After commit dc5388e79b71d796c1207681235cf007c39810bd, which removed support for non-EABI, qt_atomic_yield() and q_atomic_lock are no longer used. Remove them. Change-Id: I0f405ae63d7903c222fc2b829887207885be0a03 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove #include "qatomic_macosx.h"Bradley T. Hughes2012-02-031-2/+0
| | | | | | | This file was removed in commit 68e5fd9ebc8a3f510e3144e981a0cb358945fb9c Change-Id: I76671f79432204c28ffa7488871d0eef07cc8dca Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix QAbstractItemModel documentationGiuseppe D'Angelo2012-02-031-0/+1
| | | | | | | | Commit 20abd88e711a2dfcbe07925f8902faa45e5110e2 refactored the supportedDragActions methods, this oneliner adds the necessary \fn. Change-Id: I373b039138e1cbfe0f28a0aa9eb3b65245f2132d Reviewed-by: David Faure <david.faure@kdab.com>
* Add support for QNX iconv implementationRafael Roquetto2012-02-032-0/+6
| | | | | | | | | | | QNX implements the POSIX version of iconv (with non-const function signatures). However, it is still necessary to link with libiconv, unlike most cases. Also, its iconv_open does not know how to handle an empty string. Change-Id: I8654703e46b9c64503aca5521ce7fae1c97d7968 Reviewed-by: Mark Brand <mabrand@mabrand.nl> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove QInputContextPekka Vuorela2012-02-0313-638/+9
| | | | | | | | | | This has only been around as compatibility interface for Qt4 but is now replaced by QPlatformInputContext. Change-Id: I677dbbea46311bf39f6c5ca9dc3fb5009abe924a Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Rename qatomic_windows.h to qatomic_msvc.hBradley T. Hughes2012-02-036-76/+9
| | | | | | | | | | The QT_ARCH_WINDOWS(CE) define(s) aren't used to control which header to include anymore, so just remove it. We also do not need the empty src/corelib/arch/windows/arch.pri. Change-Id: I5400fc852af31907e533d0278540b8cd3da391cb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* processEvents(WaitForMoreEvents) should return after delivering eventsBradley T. Hughes2012-02-032-11/+28
| | | | | | | | | | | | | | | | | | | | | | The Cocoa event dispatcher sends timer, socket, and posted events correctly, but they are not NSEvents, and as such, they do not cause [NSApp nextEventMatchingMask] to return. When calling processEvents() with WaitForMoreEvents, but the EventLoopExec flag isn't set, we want to interrupt the WaitForMoreEvents. As a result, We should not call wakeUp() at the top of processEvents(), otherwise we end up shortcutting other event sources. We also do not need to call QCoreApplication::sendPostedEvents() directly either in processEvents(), it's the postedEventsSource job to do that. The interruptLater mechanism is always run when calling processEvents() directly (not via exec()), which causes problems when testing processEvents(). Don't use interruptLater unless the modal sessions change (which is indicated by the cached session pointer being reset to zero). Change-Id: Iec2b49a4f306b2702c979522f12a28d0b5fbd0b4 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Reimplement QIdentityProxyModel::headerData().Sergio Martins2012-02-032-0/+10
| | | | | | | | The one in the base class is slower due to parent<->source mappings. Change-Id: Ib0b337ef5d4b5b8cd9f6e1d7c5c19a770b53e0e8 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Make QAbstractItemView::itemOptions properly initialize a V4 optionGiuseppe D'Angelo2012-02-031-16/+15
| | | | | | | | | Since the QStyleOptionViewItem now contains the V4 fields, they must be properly initialized when calling itemOptions. Change-Id: I1346e6887d2d9a7eb29cc458fa4eede0b815001c Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Build with -pedanticStephen Kelly2012-02-031-2/+2
| | | | | Change-Id: I42487099855d2adaecfad0a3147141f88aca1898 Reviewed-by: David Faure <faure@kde.org>
* Add typedef for source compatibility.Stephen Kelly2012-02-021-0/+4
| | | | | | Change-Id: I73fb90b87db50db40c8a712acb25e0f966bbd5d3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Merge QStyleOption*V{2,3,4} classes togetherGiuseppe D'Angelo2012-02-022-1578/+289
| | | | | | | | | | | | | | | | | | | | | | | In order to keep binary compatibility, Qt 4 introduced V{2,3,4} classes for QStyleOption subclasses. They're simple, low level containers for various members with public access (no accessors required). In Qt 5.0 we can break BC, so this patch moves the members from the derived classes into the ``base'' ones. The ``base'' ones get a version bump matching the highest version available, and the V{2,3,4} classes become typedefs. This change can cause problems in code that used QStyleOption directly, especially QStyleOptionViewItem, because the old V4 fields get default initialization but the QStyle subclasses detect that the option is a V4 option and expect all fields to be properly initialized. The fix in such places is to properly initialize all fields. Task-number: QTBUG-23522 Change-Id: I2f782da09ca5cc8c4cbafc07448fb0d33153a251 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Improve QSurface / QWindow API a bit and use that to avoid errorsGunnar Sletta2012-02-026-15/+79
| | | | | Change-Id: Iadba1c3a7b8e6bc7f145455132cefed2a905c11d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Update wrong docs for TouchPoint::id().Laszlo Agocs2012-02-021-3/+2
| | | | | | | | What it states is simply not true, at least certainly not since QPA has been introduced. Change-Id: If8aa2120cf5fc9ca85f4f0e6832b2115a5b71fe1 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Build with QT_NO_CAST_FROM_BYTEARRAYStephen Kelly2012-02-021-2/+2
| | | | | Change-Id: Ibb79e372a3adf90c9f982f50ab711066063eff4a Reviewed-by: David Faure <faure@kde.org>
* Windows QPA: Compile with QT_NO_CAST_FROM_ASCII, warnings.Friedemann Kleint2012-02-024-9/+13
| | | | | Change-Id: I75d6a102a6a1fa0b5f8add049442f23d6fd57725 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix unintended source compatiblity break in QSslSocketShane Kearns2012-02-021-0/+1
| | | | | | | | | | | QSslSocket overrides one version of QAbstractSocket::connectToHost. Since these functions were made virtual, this now hides the other overloads. Added a using statement to make the other overloads visible. Change-Id: Ia48fdc9bd67936c75c25bb24dabd26a723bb7a05 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Various documentation fixes ported from Qt 4.8Teemu Katajisto2012-02-025-5/+10
| | | | | | | | | | | | | | | Selected fixes for qtbase from 4.8 commit 3826203f744a2147bebf5f088de0d524156f59fd Task-number: QTBUG-9466 Task-number: QTBUG-7924 Task-number: QTBUG-20355 Task-number: QTBUG-19367 Task-number: QTBUG-14554 Change-Id: I551251dd8a87d7dd837e5927050ffd14bce9a97c Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Move QString <-> NSString conversion to QtCoreMorten Johan Sorvig2012-02-0213-80/+130
| | | | | | | | | | | | | | | | Add (private) API to QCFString: static QString toQString(NSString *) static NSString *toNSString(const QString &) Add implementation to qcore_mac_objc.mm. Keep the mac_cpp since it's used for building qmake as well as bootstrapping. Replace usage of NSString conversion functions in the cocoa and corewlan plugin with QCFString. Change-Id: I9f34edd5231255aef9d8d6e9a60306174bb279b3 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Call start() even when bearer is not compiled.Xizhi Zhu2012-02-021-7/+5
| | | | | | | Otherwise, the HTTP request won't be sent if bearer is not compiled. Change-Id: I9a8171fde6fe5b2db0405b4af6e1d52ac4528502 Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Remove one un-used variant.Xizhi Zhu2012-02-021-1/+0
| | | | | Change-Id: I325451f2f346cc75f23703118b451b9c7398baea Reviewed-by: Shane Kearns <ext-shane.2.kearns@nokia.com>
* Fix qmlscene segfault on startup on Mac OS 10.6.Morten Johan Sørvig2012-02-021-2/+4
| | | | | | | | | | | | | | | | Task-number: QTBUG-23982 The platform plugin loader was searching for plugins in qtbase/bin and would segfault when checking if the qmlscene binary was a plugin. Test if "../Plugins" actually exists before setting it as the platform plugin path. Change-Id: Ibd887b5c5045d23e3eb62867dc7598e09d3918ad Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* speed up font enumeration in windows platformjian liang2012-02-021-8/+31
| | | | | | | | | | | Currently, font enumeration is very slow in windows platform, it will take several seconds to enumerate all fonts for the first time. This patch cache the font information queried from font registry, it can significantly speed up font enumeration. Change-Id: Ic783877b7f3db3facf24965b0c5d669b22d40c61 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Fix QString::operator=(QLatin1String) for substringsKent Hansen2012-02-021-1/+1
| | | | | | | | | QLatin1String now has a constructor that takes explicit length, which makes it possible to create a QLatin1String that isn't null-terminated. Made QString::operator=(QLatin1String) work in that case. Change-Id: Ie77eabd2f8f036531d67cd8051a7b6305b386ccf Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix QTextStream and QDebug operator<< for QLatin1StringKent Hansen2012-02-023-1/+17
| | | | | | | | | QLatin1String now has a constructor that takes explicit length, which makes it possible to create a QLatin1String that isn't null-terminated. Made the QTextStream and QDebug << operators work in that case. Change-Id: I94d051ce2ebfb2d2a403b96d25e040c80a54bf7c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix QString(QLatin1String) constructor for substringsKent Hansen2012-02-021-1/+1
| | | | | | | | | QLatin1String now has a constructor that takes explicit length, which makes it possible to create a QLatin1String that isn't null-terminated. Made the QString(QLatin1String) constructor work in that case. Change-Id: I4f4f07a956144b7ea4aa9c58a61c755fb99ef1b3 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix operator==(QLatin1String, QLatin1String) and friends for substringsKent Hansen2012-02-021-6/+10
| | | | | | | | | QLatin1String now has a constructor that takes explicit length, which makes it possible to create a QLatin1String that isn't null-terminated. Made the QLatin1String comparison operators work in that case. Change-Id: I234ba851e67a6f5cfbb46fb6f0b22623ce40be28 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Port the Windows atomic implementation to use QGenericAtomicOpsBradley T. Hughes2012-02-023-237/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | First, we do not need to have the QT_INTERLOCKED_REMOVE_VOLATILE(a) macro anymore either, since the value stored in QBasicAtomicInteger is not volatile. Windows provides Interlocked*Pointer() functions in some configurations, so we provide a partial specialization of QAtomicOps for pointer types. For integer types, QAtomicOps selects an implementation based on the size of the type. At the moment, we only support 32-bit types, but it will be possible to add 64-bit later. Note that the 32-bit specialization of QAtomicOpsBySize declares the Type typedef as long, not int, since the Windows Interlocked*() API takes parameters as longs and long pointers. Since this typedef differs from the type given to QBasicAtomicInteger<T> by the QBasicAtomicInt typedef, we need to templatise the _q_value parameter separately from the other arguments in QGenericAtomicOps. This templatisation would be necessary to port other architectures, such as PA_RISC, where we need to have an int[4] array in the atomic type while the arguments do not need this array. Change-Id: Id71fa1ae334da2023553cb402b45e6c285f1d344 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Renamed QInputPanel as QInputMethodPekka Vuorela2012-02-0227-282/+411
| | | | | | | | | | | QInputMethod better describes what the class is about, input methods in general, be they panels or just composing input from key events. Compatability headers added for old name. Not bulletproof but should be enough to get transition done. Change-Id: Iefde6e7ccb1ec4a3b226cef3469089e751c60fc1 Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
* Remove duplicated function from QCocoaEventDispatcherBradley T. Hughes2012-02-021-23/+7
| | | | | | | | | | | | | | The qt_mac_waitForMoreModalSessionEvents() is identical to qt_mac_waitForMoreEvents(), except that it passes a different inMode parameter to [NSApp nextEventMatchingMask]. Change the latter function to take the mode as a parameter itself, defaulting to the default mode. Change the dequeue parameter to [NSApp nextEventMatchingMask] from YES to NO. Having the function dequeue the event, and then immediately reposting the event is not necessary. Change-Id: Iba45d41ad3ff4d5721d1068e6d5c78585cb15810 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
* Don't include config.tests/unix/openssl/openssl.priBradley T. Hughes2012-02-021-4/+0
| | | | | | | This file was removed in commit ba9302b8a9b6b50f37987261c1ade9af2ade2d3c Change-Id: Ib3a70877f6f6848c8cf072faf13da93abbe186f2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fix memory leak of QAccessibleWidgetJian Liang2012-02-021-1/+1
| | | | | | | | | | | in topLevelObjects() we should use "root->object()" instead of "w->accessibleRoot()->object() to get the object attached to the accessible interface. This is because "w->accessibleRoot()" will create a new QAccessibleWidget(or its subclass) object and this object is never released. Change-Id: I34292b467b51d6cc439f0a1a45cd74d5f8a6a5a8 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Avoid duplicating flags/types in qmetaobjectbuilderKent Hansen2012-02-021-57/+3
| | | | | | | | | | | Presumably the contents from qmetaobject_p.h were copied because qmetaobjectbuilder originally lived outside of qtbase, and private headers could not be included from other modules. But now we can just include the right headers. Change-Id: I975df1ea94455f1bf0db1d8024de8f5379fc9fc7 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
* qopenglcontext not checking for null and failing with platform minimalKurt Korbatits2012-02-021-0/+2
| | | | | | | | | | - The minimal platform plugin returns null and was causing segfault. Change-Id: Ied262692f77e9801c3d3451de7f21539f7686ca4 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* pixmap: Add QPlatformPixmap::fromData null check for the imageHolger Hans Peter Freyther2012-02-021-0/+2
| | | | | | | | | | QPlatformPixmap::fromFile is doing the null check, QRasterPlatformPixmap::fromData is doing the null check as well. Add the null check to QPlatformPixmap::fromData as well. This would have avoided a crash in the directfb plugin. Change-Id: Ifc904b2df2424e86bf0992d4e28dc256530be02d Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fix some warnings from clangLars Knoll2012-02-023-5/+5
| | | | | | | | | One of them was a real error, that could lead to Data::alloc containing wrong values. Change-Id: I48315ef6fd59188630107ebbe7bf8dbaa5da689e Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Introduce QItemDelegate::destroyEditor virtual invoked at editor closeThorbjørn Lund Martsum2012-02-024-8/+28
| | | | | | | | | | | | | | This provides a stronger mechanism e.g when inheriting QItemDelegate. It makes some things much easier e.g avoid delete of an editor and maybe only delete depending on what the editor says itself. This introduces a new virtual function. Task-number: QTBUG-2299 Change-Id: I8410f8199775987dbacffd99e4c354fdadcdd21f Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>