summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Removed unnecessary Q_OS_SYMBIAN ifdefsMiikka Heikkinen2009-08-241-2/+2
| | | | | | | | Q_OS_UNIX branch of ifdef is ok to execute in homePath and tempPath cases of QDir autotest for Symbian. Q_OS_SYMBIAN branch was never even entered for Symbian builds. Reviewed-by: TrustMe
* Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-08-24179-846/+46016
|\ | | | | | | | | Conflicts: src/corelib/io/qfsfileengine_unix.cpp
| * Added some internal docs to make the class clearer.axis2009-08-211-0/+6
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicIain2009-08-211-5/+5
| |\
| | * Fixed an MSVC 9.0 /2008 warningAlessandro Portale2009-08-211-5/+5
| | | | | | | | | | | | Reviewed-By: Harald Fernengel
| * | Merge branch 'symbolVisibility'Iain2009-08-2124-5/+39189
| |\ \ | | |/ | |/|
| | * Merge commit 'origin/master' into symbolVisibilityIain2009-08-21677-39737/+27759
| | |\
| | * | Update EABI DEF files after 4.6 mergeIain2009-08-2110-1160/+2560
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed exports are marked ABSENT, as we're experimenting with how hard it will be to maintain BC once these DEF files are final. There were probably too many exports anyway, as I think I might have originally frozen them with a version of RVCT that had the symbol visibility issues. Reviewed-by: TrustMe
| | * | Merge commit 'origin/master' into symbolVisibilityIain2009-08-20387-1266/+34125
| | |\ \
| | * | | Update schema version number for SBSv2 Qt integrationIain2009-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New version of SBSv2 build schema release, but no impact on our file, so just update the version number. Reviewed-by: TrustMe
| | * | | ***EXPERIMENTAL*** DEF files for WINSCW targetsIain2009-08-199-0/+19218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: these *will* change between now and the release of 4.6, they should not be relied upon for anything - they are purely for experimental purposes Task-number: 259810 (partial) Reviewed-by: TrustMe
| | * | | ***EXPERIMENTAL*** DEF files for EABI targetsIain2009-08-199-0/+18549
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: these *will* change between now and the release of 4.6, they should not be relied upon for anything - they are purely for experimental purposes Webkit DEF files to follow in later commit...
| | * | | New definition for ...EXPORT_INLINE to deal with the way we drive RVCTIain2009-08-191-0/+6
| | | | |
| | * | | Ensure the correct set of symbols are exported in the DEF files (part 1)Iain2009-08-193-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For DLLs using Qt-style class level exports, ensure that only public symbols are exported For static libraries (static, staticlib configs) we don't want/need/ can't have a DEF file
| * | | | Fixed compile error.axis2009-08-211-1/+1
| | | | |
| * | | | Merge branch 'master' of git@scm:qt/qt-s60-public into master-s60axis2009-08-211-12/+0
| |\ \ \ \
| | * | | | remove the old .pri files, forgotEspen Riskedal2009-08-211-12/+0
| | | | | |
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2190-228/+5506
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h
| | * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBjørn Erik Nilsen2009-08-216-105/+244
| | |\ \ \ \ \
| | * | | | | | Doh, we have to convert the pixmap to an image.Bjørn Erik Nilsen2009-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke after 9d639659f2334bb5f3ea9b16b23bcb0127752f64 Reviewed-by: TrustMe
| | * | | | | | Merge commit 'qt-kinetic/kinetic-graphicseffect'Bjørn Erik Nilsen2009-08-2190-228/+5506
| | |\ \ \ \ \ \
| | | * | | | | | Cleanup after wrong merge.Bjørn Erik Nilsen2009-08-211-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExtraGestures is not in the master branch, and gestures has not been touched in the kinetic-graphicseffect branch so this must be a result of a wrong merge at some point. Remove it.
| | | * | | | | | Only compile shader effect example when having OpenGL.Bjørn Erik Nilsen2009-08-212-3/+3
| | | | | | | | |
| | | * | | | | | Move shader effect example from examples/graphicsview to examples/effectsBjørn Erik Nilsen2009-08-2120-4/+10
| | | | | | | | |
| | | * | | | | | Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-21500-38189/+24506
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri
| | | * | | | | | | Improve performance of the drop shadow pixmap filter.Bjørn Erik Nilsen2009-08-212-30/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The convolution filter is horrible slow. Instead we use a custom blur filter which is much more efficient. Reviewed-by: Samuel
| | | * | | | | | | Add an alpha to the drop shadow pixmap filter by the default.Bjørn Erik Nilsen2009-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shadows looks much nicer with an alpha, so we should use it by default. Reviewed-by: Gunnar
| | | * | | | | | | Fix broken drop shadow pixmap filter on X11.Bjørn Erik Nilsen2009-08-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xrender is not rocket science when it comes to composition modes, so we have to use the raster engine for the fill. toImage/fromImage is a no-op on QWS and Windows, and on other platforms it is required, so we don't have to add any ifdefs or clever checks. Reviewed-by: Gunnar
| | | * | | | | | | Use pixmap filter for the drop shadow effect.Bjørn Erik Nilsen2009-08-216-150/+48
| | | | | | | | | |
| | | * | | | | | | Add auto-tests for QGraphicsItem/QWidget::setGraphicsEffect.Bjørn Erik Nilsen2009-08-212-0/+64
| | | | | | | | | |
| | | * | | | | | | Merge commit 'qt/master-stable' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-2083-990/+2735
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene.cpp
| | | * | | | | | | | Fix some rendering bugs on the Mac when applying an effect to QWidget.Bjørn Erik Nilsen2009-08-201-4/+4
| | | | | | | | | | |
| | | * | | | | | | | Delete existing graphics effect when setting a new one.Bjørn Erik Nilsen2009-08-202-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we had to delete the existing effect before setting a new one (in the same fashion as QLayout behaves). This feels wrong and we should automatically delete it instead.
| | | * | | | | | | | Add "QObject *parent = 0" to QGraphicsShaderEffect constructor.Bjørn Erik Nilsen2009-08-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See also 39f5298ef2c0424e7b4916d8d1de1d46e534daee
| | | * | | | | | | | Fix the most obvious rendering bugs when applying an effect to QWidget.Bjørn Erik Nilsen2009-08-207-46/+118
| | | | | | | | | | |
| | | * | | | | | | | Add support for graphics effects on QWidget.Bjørn Erik Nilsen2009-08-208-6/+192
| | | | | | | | | | |
| | | * | | | | | | | Make QGraphicsItem::effectiveBoundingRect/sceneEffectiveBoundingRect internal.Bjørn Erik Nilsen2009-08-205-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These shouldn't be in public API unless someone ask for it. The same information is accessible via public functions in QGraphicsEffect and QGraphicsEffectSource, so they are only convenience functions after all.
| | | * | | | | | | | Rename QGraphicsShadowEffect to QGraphicsDropShadowEffect.Bjørn Erik Nilsen2009-08-206-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discussed with Andreas.
| | | * | | | | | | | Add missing effects.pri file in src/gui/effectsBjørn Erik Nilsen2009-08-201-0/+4
| | | | | | | | | | |
| | | * | | | | | | | Compile graphics effect on all platforms.Bjørn Erik Nilsen2009-08-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like we need to include graphicseffect.h even though it should have been included by the _p.h.
| | | * | | | | | | | Header cleanup.Bjørn Erik Nilsen2009-08-201-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Graphics effects is no longer dependent of graphics view.
| | | * | | | | | | | Make QGraphicsXXXEffect::boundingRectFor public.Bjørn Erik Nilsen2009-08-201-2/+2
| | | | | | | | | | |
| | | * | | | | | | | Graphics Effect cleanup: Remove old comments; not valid anymore.Bjørn Erik Nilsen2009-08-202-58/+4
| | | | | | | | | | |
| | | * | | | | | | | Add Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsEffect::ChangeFlags)Bjørn Erik Nilsen2009-08-201-0/+1
| | | | | | | | | | |
| | | * | | | | | | | Compile graphics effect.Bjørn Erik Nilsen2009-08-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to include QColor and QRect rather than forward declare them.
| | | * | | | | | | | Add QT_BEGIN_NAMESPACE and QT_END_NAMESPACEBjørn Erik Nilsen2009-08-201-0/+4
| | | | | | | | | | |
| | | * | | | | | | | Add "QObject *parent = 0" to all graphics effect constructors.Bjørn Erik Nilsen2009-08-202-21/+21
| | | | | | | | | | |
| | | * | | | | | | | Cleanup after 19e01c93f9421a8db6c8a93ac103a7df2b93d9ecBjørn Erik Nilsen2009-08-192-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsEffect is no longer dependent on the Graphics View module.
| | | * | | | | | | | Move examples/graphicsview/blurpicker|lighting to examples/effects.Bjørn Erik Nilsen2009-08-1926-6/+17
| | | | | | | | | | |
| | | * | | | | | | | Make all graphics effect setters Q_SLOTS.Bjørn Erik Nilsen2009-08-191-7/+13
| | | | | | | | | | |