diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:31:32 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-10 18:31:32 +0100 |
commit | 7ebe6263c14ad517c73d0c082fc3e962364b8757 (patch) | |
tree | 6863e13476b172249764e5b3a74660756e4e7c1a /src/plugins/iconengines/svgiconengine | |
parent | 224194151ccde2b255ba24e14855b2fa497f1952 (diff) | |
parent | 62c8144782b380407c87d0f75a0f7f7df3847035 (diff) | |
download | qtsvg-7ebe6263c14ad517c73d0c082fc3e962364b8757.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1acc7b8d54e8db1a3bec01c31c755032d24e8e64
Diffstat (limited to 'src/plugins/iconengines/svgiconengine')
-rw-r--r-- | src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp index a0e30e9..a8a2d15 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp @@ -87,11 +87,6 @@ public: QAtomicInt QSvgIconEnginePrivate::lastSerialNum; -static inline int pmKey(const QSize &size, QIcon::Mode mode, QIcon::State state) -{ - return ((((((size.width()<<11)|size.height())<<11)|mode)<<4)|state); -} - QSvgIconEngine::QSvgIconEngine() : d(new QSvgIconEnginePrivate) { |