summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Re-enabled the QPixmap cleanup hooks in QPixmap destructor.Trond Kjernåsen2009-08-281-0/+2
| | | | Reviewed-by: Gunnar
* Fixed QGLWidget::renderText() when using the GL 2 paint engine.Trond Kjernåsen2009-08-284-23/+108
| | | | | | | | | QGLWidget::renderText() needs to respect the current depth and scissor tests that the user has set. Therefore we needs some special casing in the GL 2 paint engine to handle the custom depth testing. The private setRenderTextActive() has been added for this purpose. Reviewed-by: Samuel
* Fixed a problem where the InvertedYBindOption was always removed.Trond Kjernåsen2009-08-281-1/+1
| | | | Reviewed-by: Samuel
* Enable Q_OBJECT usage across DLL boundary on Symbian OSShane Kearns2009-08-284-7/+44
| | | | | | | | | | | | | | | | Symbian loader does not allow DLL import relocations in the data section. To workaround this, added an accessor function which can be used to get the class static metadata from the base class even if it is in another DLL. Changing the implementation for all platforms would cause a binary break, so it is only used for Symbian. The Q_NO_DATA_RELOCATION macro is used to configure this feature instead of Q_OS_SYMBIAN, because it is possible another platform may need the same fix and Symbian may eventually fix their DLL loader to support this feature. Task-number: 258893 Reviewed-by: Kent Hansen
* Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-08-287-36/+46
|\
| * doc: Fixed several qdoc errors.Martin Smith2009-08-281-2/+2
| |
| * Whitespaces & indentation cleanup in qobjectLeonardo Sobral Cunha2009-08-282-26/+27
| | | | | | | | Reviewed-by: trustme
| * Fixed runtime warning in tst_QGraphicsProxyWidget::childPos.Gabriel de Dietrich2009-08-281-2/+2
| | | | | | | | | | | | | | ungrabKeyboard was called on an item without checking whether it was a keyboard grabber. Reviewed-by: bnilsen
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-281-4/+4
| |\
| | * Added some information to QGLFramebufferObject documentationSamuel Rødal2009-08-281-4/+4
| | | | | | | | | | | | Reviewed-by: Trond
| * | Doc: Fixed the build instructions for the OCI plugin (for Oracle 10).David Boddie2009-08-281-1/+1
| |/ | | | | | | | | Task-number: 234150 Reviewed-by: Trust Me
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-28648-1717/+24039
| |\
| * | Doc: Added some information about the clipping applied in paint events.David Boddie2009-08-281-1/+10
| | | | | | | | | | | | | | | Task-number: 203483 Reviewed-by: Trust Me
* | | Added preprocess only option for createpackage.batJanne Anttila2009-08-281-9/+15
| |/ |/| | | | | | | | | The prerocessing is needed by installer scripts. Reviewed-by: Miikka Heikkinen
* | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-08-2811-246/+439
|\ \
| * \ Merge branch '4.5' into 4.6Olivier Goffart2009-08-280-0/+0
| |\ \
| | * | Fixes: Crash when double-clicking a tab in a QTabBar with movable tabsOlivier Goffart2009-08-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | This is a backport of commit 8ac7e81260 Reviewed-by: Peter Hartmann
| * | | doc: Fixed several qdoc errors.Martin Smith2009-08-281-31/+45
| | | |
| * | | Add test for the styled close buttonOlivier Goffart2009-08-281-0/+128
| | | |
| * | | Document the fact that you can change QTabBar close button with stylesheetOlivier Goffart2009-08-282-3/+18
| | | |
| * | | Whitespaces fixOlivier Goffart2009-08-282-195/+195
| | | |
| * | | QTabBar: Add ability to change the position of the close button in the ↵Olivier Goffart2009-08-281-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | stylesheet Task-number: 241383 Reviewed-by: jbache
| * | | QTabBar: Being able to change the close button appearence in the stylesheetOlivier Goffart2009-08-281-3/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: jbache Task-number: 241383
| * | | Ensured that the framebufferobject example has a stencil buffer.Samuel Rødal2009-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The stencil buffer is used for rasterization in the GL 2 paint engine. Reviewed-by: Trond
| * | | doc: Fixed several qdoc errors.Martin Smith2009-08-281-9/+9
| | | |
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6mread2009-08-28589-1243/+21897
| |\ \ \
| * | | | Deleting the CFontStore without a crashmread2009-08-283-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CFontStore deletion crashes if there are any open fonts in it. These are now all deleted before the store is deleted. Reviewed-by: aportale
| * | | | Fix for "Undefined symbol typeinfo for std::exception" in armv5 buildmread2009-08-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that the use of QT_TRYCATCH_LEAVING, which expands to ...catch(const std::exception&)... requires access to the typeinfo for std::exception. This cannot be found in any import library (probably an OpenC defect). But this workaround creates the necessary info for the link. Otherwise this change has no effect. Reviewed-by: jbarron
* | | | | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6Janne Anttila2009-08-286-21/+16
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | doc: Fixed several qdoc errors.Martin Smith2009-08-286-21/+16
| | | | |
* | | | | Merge branch 'master' into 4.6Janne Anttila2009-08-2814-183/+355
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Minor fix to space usage in makefile.Janne Anttila2009-08-281-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| * | | | Changed createpackage parameters to be more consistent with make targets.Janne Anttila2009-08-284-23/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier createpackage required two separate parameters to define the platform and target. For example > createpackage fluidlauncher_template.pkg release armv5 Now it is changed to: > createpackage fluidlauncher_template.pkg release-armv5 This is consistent to make target what is used to do the building i.e.: > make release-armv5 The change also affected environment variables supported by 'make sisx' target. QT_SISX_PLATFORM is not any more supported, and the info is merged QT_SISX_TARGET variable. Reviewed-by: Miikka Heikkinen
| * | | | Minor fix to MAKEFILE variable in SBSv2 generated makefiles.Janne Anttila2009-08-281-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MAKEFILE variable pointed to root bld.inf from which makefile was generated but it shoudl contain the makefile name instead. This is how it work in abld generator. Reviewed-by: TrustMe
| * | | | Various small fixes and cleanups for symbian qmake generator.Janne Anttila2009-08-287-43/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The included fixes / cleanups: - QtLibs PKG filename changed - Component name in Qt libs pkg changed to "Qt for S60" * Done in order to make SISX upgrade possible after pre-release. - Removed passing of 'fixedTarget' member variable as an argument - Removed whitespaces from generated file names - Fixed 'make sisx' calling syntax when custom makefile name used - Fixed MAKEFILE variable content in generated makefiles - Changed names of environment variables used by 'make sisx' * Nee variables have 'QT_SISX_' prefix Reviewed-By: Miikka Heikkinen
| * | | | Bug fix for store_build target when using subdirs project template.Janne Anttila2009-08-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | .make.cache need to be generated also for subdirs, this commit fixes this bug in previous commit related to 'make sisx' target.
| * | | | Fixed createpackage.bat params to be more consistent with make targets.Janne Anttila2009-08-272-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Createpackage.bat now accepts also release/debug instead of urel/udeb. Also the order is swicthed so that now you need to call: >createpackage.bat [-i] pkgfile release armv5 [certificate key [passphrase]] instead of >createpackage.bat [-i] pkgfile armv5 urel [certificate key [passphrase]] RevBy: Miikka Heikkinen
| * | | | Added support for 'make sisx' target in Symbian OS.Janne Anttila2009-08-277-4/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f189e00 added support for template PKG file. This commit extends the template PKG file usage with new make target, i.e. the commit adds a new make target called sisx, which can be used to generate signed sisx files. The sisx target is basically wrapper for calling createpackage.bat, but it also adds support for default platform/target and environment variables. Default platform/target feature means that SIS packages are automatically created for last build target. For example: >qmake >make release-armv5 >make sisx <- Creates sisx for release-armv5 It is also possible to override the platform and target for which the SISX is created as follows: >qmake >make release-armv5 debug-winscw >make sisx PLATFORM=ARMV5 TARGET=UREL <- Creates sisx for release-armv5 Since PLATFORM and TARGET are make variables they can also be defined as an environment variables instead of passing them for make. I.e. the following is indentical to previous example: >set PLATFORM=ARMV5 >set TARGET=UREL >qmake >make release-armv5 debug-winscw >make sisx <- Creates sisx for release-armv5 The environment variables are also useful if you have your own developer certificate what you want to use for signing SIS files. For example: >set CERTIFICATE=mycert.cer >set KEY=mykey.key >qmake >make release-armv5 >make sisx The above example creates release-armv5 SIS package with custom certificate and key (key without password). If certificate and key are not defined, the same logic as in old createpackage.bat will be used i.e. if RD cert is available in Qt root it will be used, and if not self-signed cerfificate will be used. The environment variables supported by 'make sisx' are: PLATFORM TARGET CERTIFICATE KEY PASSPHRASE The createpackage.bat can still be called directly but preferred way is to use new make target directly as examples above demonstrated. Task: 259037 RevBy: Miikka Heikkinen
| * | | | Support for template PKG file.Janne Anttila2009-08-275-123/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes qmake to generate only one template pkg file, instead of one for each supported platform and build. Due to this change createpackage.bat script now need to be called with two additional parameters - platform and target. Example of needed changes: Instead of old way: >createpackage.bat [-i] pkgfile [certificate key [passphrase]] The new implementation works as: >createpackage.bat [-i] pkgfile platform build [certificate key [passphrase]] In addition createpackage.bat backend is replaced by createpackage.pl, it takes care of preprocesing the pkg file, i.e. expanding the variables with their values and calling the makesis and signsis with right parameters. Perl is used to make implementation more cross-platform. Task: 259037 RevBy: Miikka Heikkinen
| * | | | Make fluidlauncher sis generation work with -no-script configurationMiikka Heikkinen2009-08-261-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fluidlauncher was trying to add context2d executable to sis package, even if it is not built because -no-script. Reviewed-by: Shane Kearns
* | | | | doc: Fixed several qdoc errors.Martin Smith2009-08-285-17/+35
| | | | |
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Prasanth Ullattil2009-08-28575-1200/+21834
|\ \ \ \ \
| * | | | | QScriptContextInfo: fix the line numbers with JITOlivier Goffart2009-08-282-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | It even works better than with the interpreter
| * | | | | QScriptEngine: Remove one superflous stackframe for native call made by JITOlivier Goffart2009-08-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JIT does create stackframe while the interperer doesn't. So we would end up with one superflous stackframe Reviewed-by: Kent Hansen
| * | | | | Fix QtOpenGL autotestTom Cooksey2009-08-281-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The GL2 paint engine now has it's own class ID. This patch also reduces the excessive 2000ms delays to 200ms. :-) Reviewed-by: Trustme
| * | | | | Runtime warning about non existing "zRotation" property in examples/states.Gabriel de Dietrich2009-08-281-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed by using the "rotation" property instead. Task-number: 260403 Reviewed-by: ogoffart
| * | | | | Merge branch '4.6' of git:qt/qt into 4.6Thiago Macieira2009-08-2814-50/+380
| |\ \ \ \ \
| | * | | | | Q_ASSERT failure in QStateMachinePrivate::handleTransitionSignal.Gabriel de Dietrich2009-08-286-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal index actually emitted was different from the signal index registered. This was due to recent changes in the meta-object protocol, where new indexes are being created (cloned) for signals with default parameters. When registering the transition signal, we now look for the original (non cloned) signal index. The transition keeps track of the user-specified signal index, and sets it when calling onTransition. Reviewed-by: Kent Hansen Reviewed-by: Olivier Goffart Task-number: 260403
| | * | | | | Documentation of QAbstractProxyModel::resetOlivier Goffart2009-08-281-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rectification after the last merge request integration Reviewed-by: Thierry
| | * | | | | Fix the API for resetting QAbstractItemModels.Stephen Kelly2009-08-287-37/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit deprecates the QAIM::reset() method, and adds beginResetModel() and endResetModel() methods, addressing Qt issue 247023. http://www.qtsoftware.com/developer/task-tracker/index_html?method=entry&id=247023 If models and proxies use QAIM::reset() alone, then proxies will emit modelAboutToBeReset after its source model is reset. This means that mapToSource will not behave as expected (Will always return an invalid index) in a slot connected to modelAboutToBeReset. The usecase for this is maintaining viewstate (which items are selected, expanded) when the model is reset. See BrowserWidget::modelChanged here: http://websvn.kde.org/trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget.cpp?view=markup Task-number: 247023 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Merge-request: 1072
generated by cgit v0.12 at 2024-09-21 02:42:09 (GMT)