summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Enable the unified toolbar with the rasterFabien Freling2010-10-196-4/+20
| | | | | engine only in the Cocoa port. Reviewed-by: Tor Arne Vestbø
* Moving the resetInternalData slot to QAbstractProxyModelGabriel de Dietrich2010-10-194-26/+26
| | | | | | | Patch provided by Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: gabi Merge-request: 694
* Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2010-10-192-0/+25
| | | | | | | | | Direct subclasses of QAbstractItemModel are unnaffected as they can update internal data in a slot connected to the sourceModel's modelReset signal or layoutChanged signal. Reviewed-by: gabi Merge-request: 694
* Emit beginResetModel before updating the strings.Stephen Kelly2010-10-191-1/+2
| | | | | Reviewed-by: gabi Merge-request: 694
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-181-2/+2
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Send the hoverLeave not properly sent on the widget inside QGPW.
| * Send the hoverLeave not properly sent on the widget inside QGPW.Alexis Menard2010-10-181-2/+2
| | | | | | | | | | | | | | | | We need to send the hover leave event on the proper receiver in case the widget we embed in a complex hierarchy not the widget itself. Task-number:QTBUG-6986 Reviewed-by:bnilsen
* | Add a few default-constructors to comply with C++'03 [dcl.init] p9Tor Arne Vestbø2010-10-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++'03 [dcl.init] p9 says: "If no initializer is specified for an object, and the object is of (possibly cv-qualified) non-POD class type (or array thereof), the object shall be default-initialized; if the object is of const-qualified type, the underlying class type shall have a user-declared default constructor." QXmlStreamAttributes and a few classes in the QXmlQuery test were missing them. Relevant GCC and Clang bugs: - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=42844 - http://llvm.org/bugs/show_bug.cgi?id=6772 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Help the compiler look up erase() and insert() in Q3ValueVectorTor Arne Vestbø2010-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Q3ValueVector test failed to compiled with Clang, giving: q3valuevector.h:87:13: error: use of undeclared identifier 'erase' erase(this->begin() + n, this->end()); ^ this-> Clang version 2.9 (git://repo.or.cz/clang.git c81d9e3c34b) Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: David Faure <faure@kde.org>
* | Explicitly inherit from NSOpenSavePanelDelegate on Mac OS 10.6 and aboveTor Arne Vestbø2010-10-181-1/+7
|/ | | | | | Prior to Mac OS 10.6 this was an informal protocol. Reviewed-by: Morten Sørvig
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-151-1/+1
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Adds support for sun-libiconv to plugins.pro
| * Adds support for sun-libiconv to plugins.proMartin Pejcoch2010-10-151-1/+1
| | | | | | | | | | | | | | | | Some Solaris machines are using sun-libiconv, which can also be used to compile the plugins. Task-number: QTBUG-14176 Reviewed-by: Thiago
* | Revert "Explicitly inherit QNSOpenSavePanelDelegate from ↵Tor Arne Vestbø2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | NSOpenSavePanelDelegate" This reverts commit 24e0f64b8a35ddbfeae2f0611d3f1779fb56cdb0. NSOpenSavePanelDelegate is not available on Mac OS X 10.5. Reverting this until a solution can be found so that the staging area is not blocked.
* | Fix the build on Mac OS X after 24e0f64b8a3Tor Arne Vestbø2010-10-151-0/+1
| |
* | Apply WebKit revision 60451 manually to fix Clang build issueTor Arne Vestbø2010-10-151-1/+1
| | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=39945 This revision is already present in QtWebKit 2.1
* | Rename a few QtScript debugger-classes in anonymouse namespacesTor Arne Vestbø2010-10-153-12/+12
| | | | | | | | | | | | | | Workaround for Clang bug http://llvm.org/bugs/show_bug.cgi?id=8192 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Don't assign id<NSApplicationDelegate> to NSObject*, use id insteadTor Arne Vestbø2010-10-151-1/+1
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Phonon: Export ObjectDescriptionModel to prevent link errors with ClangTor Arne Vestbø2010-10-152-1/+7
| | | | | | | | Workaround for http://llvm.org/bugs/show_bug.cgi?id=8177
* | Don't use 'id' as variable name, it has special meaning in Objctive-CTor Arne Vestbø2010-10-151-2/+2
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Don't redeclare voidPtr, it's already declared in CarbonCore's Thread.hTor Arne Vestbø2010-10-151-8/+8
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Explicitly inherit QNSOpenSavePanelDelegate from NSOpenSavePanelDelegateTor Arne Vestbø2010-10-151-1/+1
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Don't assing 'const Foo*' to a 'Foo*'Tor Arne Vestbø2010-10-155-12/+12
|/ | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Disable selection of Libraries on Windows 7 in getExistingDirectory().Prasanth Ullattil2010-10-131-1/+1
| | | | | | | | | | | | The Libraries on Windows 7 are user-defined collection of folders, which is only a logical representation. There are no file system entries associated with it . This patch makes sure that user cannot choose a library when using the QFileDialog::getExistingDirectory(), in such cases it will show a standard windows warning message. Task-number: QTBUG-12655 Reviewed-by: Thierry Bastian
* Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-123-13/+3
|\ | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Revert "Don't define highp/mediump/lowp if desktop GL has them"
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-123-13/+3
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-123-13/+3
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "Don't define highp/mediump/lowp if desktop GL has them"
| | | * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-123-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6155050f68cc86c445552da61a5f240c16f5e2cd. The GL_ARB_ES2_compatibility extension does not mention the lowp, mediump or highp keywords. Task-number: QTBUG-14384 Reviewed-by: Samuel Reviewed-by: Prasanth
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-122-89/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Making the hybrid allocator change compatible across all 4.7.x"
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-10-122-89/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Revert "Making the hybrid allocator change compatible across all 4.7.x"
| | * | | Revert "Making the hybrid allocator change compatible across all 4.7.x"mread2010-10-122-89/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c27f1586d7c4c56af1f46fa09ad77f03b7736e5d. The change to make the hybrid allocator change compatible across all 4.7.x releases is not needed after 4.7. The exported function added for the hybrid allocator will always be present now.
* | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-122-3/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3 Crash fix when using the runtime graphics system on Symbian.
| * \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-122-3/+13
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Add support for Qt::WA_TranslucentBackground with OpenVG on Symbian^3Jason Barron2010-10-121-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S^3 does not have a client side API to support semi-transparent EGL surfaces so if this flag is enabled for a particular widget, then we should return a raster surface instead of a VG surface. Raster surfaces can still be semi-transparent but will be slower to render to. Task-number: QTBUG-14400 Reviewed-by: Jani Hautakangas Reviewed-by: Gareth Stockwell Reviewed-by: Sami Merila
| | * | | Crash fix when using the runtime graphics system on Symbian.Jason Barron2010-10-121-3/+5
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QWidget::destroy() is called (perhaps by setParent) then the window surface is deleted by the destructor of QSymbianControl instead of in the "normal" place which is ~QWidget(). This means that we should not attempt to use the RWindow in the window surface because it is in the process of being destroyed. Reviewed-by: Jani Hautakangas
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-124-13/+45
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix text position with OpenGL engine and Freetype
| * | | Fix text position with OpenGL engine and FreetypeEskil Abrahamsen Blomfeldt2010-10-124-13/+45
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you use the OpenGL engine, the left bearing of the glyph was incorrectly retrieved from the system as the glyph was queried with the wrong format, and adjustments for antialiasing were not applied. To make the position identical to painting with, new API was added to QFontEngine (The bounding box of a glyph is also not logically necessarily the same thing as the bounding box of the rasterized glyph.) Done-with: Trond Task-number: QTBUG-14410
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-123-7/+13
|\ \ \ | |/ / |/| / | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-113-7/+13
| |\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile fix for OpenVG without VGFont.
| | * Compile fix for OpenVG without VGFont.Samuel Rødal2010-10-113-7/+13
| | | | | | | | | | | | | | | | | | ShivaVG doesn't have VGFont support for example. Reviewed-by: Jason Barron
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2010-10-112-1/+89
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Making the hybrid allocator change compatible across all 4.7.x Spectrum demo: only use --rpath for linux-g++* mkspecs Spectrum demo: put binaries into correct locations on Windows Designer: Fix a crash when copying empty page-based containers.
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-112-1/+89
| |\ \ \ | | |/ /
| | * | Making the hybrid allocator change compatible across all 4.7.xmread2010-10-112-1/+89
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hybrid allocator introduced a new export to qtcore.dll and made all apps link to it when they linked with the corresponding qtmain.lib. However, this made all apps depend on this new export, and since that export is not present in early 4.7.x release, these apps would not run with the Qt DLLs from those releases, which breaks Qt's compatibility guarantees for patch releases. This change makes apps compatible with all 4.7.x releases again. For export frozen Qt builds (the sort that should be compatible across all 4.7.x releases), qtmain.lib no longer forces a static import link to qt_symbian_SetupThreadHeap(). Instead it dynamically loads qtcore.dll, looks up qt_symbian_SetupThreadHeap(), and calls it if present. If the function is not present, or on emulator builds where we know that qtcore will use the system allocator creation function, we call the system allocator creation function. For export unfrozen builds, there is no compatibility between builds or releases, so we do use a static import link to qt_symbian_SetupThreadHeap(), as we have to use the qtcore dll we have built with it anyway. This has been tested as follows: S60 3.1 SDK, def files not frozen. App compiled against latest code runs on the corresponding DLLs, and does not start with 4.7.0, which is what we expect. S60 3.2 SDK, def files frozen. App compiled against latest code runs on the corresponding DLLs with the new allocator, and runs on 4.7.0 DLLs with the old allocator. Which demonstrates compatibility. S60 5.0 SDK, def files not frozen, debug build. Same result as for the 3.1 SDK, which demonstrates debug build working too (all other tests are release build tests). S60 5.0 SDK, def files frozen, debug build. Same result as on S60 3.2 SDK, which demonstrates debug build working with def files. Symbian^3 SDK, def files frozen. Same result as on S60 3.2 SDK, demonstrating Symbian^3 compatibility. Symbian^4, code and tests compile and does not affect running. *** This change is only required for 4.7. It is not needed for 4.8+ *** *** If this change appears in 4.8+, it can be reverted. *** Task-number: QT-4080 Reviewed-by: Shane Kearns
* | | The completer in an itemview would not be activated right awayThierry Bastian2010-10-111-3/+3
|/ / | | | | | | | | | | | | | | | | | | If you have set the edit triggers to AnyKeyPressed and you press a key the completer would not kick in because the key event would come before the lineedit gets focus. The completer is only active when the lineedit has focus. Task-number: QTBUG14363 Reviewed-by: ogoffart
* | Add some tests for Indic shaping in HarfbuzzEskil Abrahamsen Blomfeldt2010-10-111-0/+29
| | | | | | | | | | | | | | | | These were added to confirm the behavior in merge request 2484. Their validity depends on the validity of the merge request. Task-number: QTBUG-13620, QTBUG-13616, QTBUG-13542
* | Fix several errors with shaping of Indic scriptsप्रविण सातपुते2010-10-111-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The opentype init feature was applied to some characters even when the character appeared inside a word. 2. Using the ZWJ to separate Ra and Halant Ya should connect the two latter characters and form a Yaphala 3. Some Oriya chars were not correctly marked as below-base form. Task-number: QTBUG-13620, QTBUG-13616, QTBUG-13542 Merge-request: 2484 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | Remove references ofFabien Freling2010-10-111-1/+0
| | | | | | | | | | | | qunifiedtoolbarcontainer_mac_p.h Reviewed-by: Eskil Abrahamsen Blomfeldt
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0918-15/+461
|\ \ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Experimental support of the unified toolbar with
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0918-15/+461
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Experimental support of the unified toolbar with
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0918-15/+461
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Experimental support of the unified toolbar with
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0818-15/+461
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Experimental support of the unified toolbar with
| | | | * | Experimental support of the unified toolbar withFabien Freling2010-10-0818-15/+461
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the raster engine on Mac OS X. Task-number: QTBUG-12615 Reviewed-by: Samuel Rødal
generated by cgit v0.12 at 2025-02-11 03:41:59 (GMT)