diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:05:00 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-16 18:05:00 +0100 |
| commit | e8efb8f55d9ef0f1cfbbf6c50a71a3aada017f78 (patch) | |
| tree | c2b07c643f0c35236b1a9724bf5cf83e4b52afdf /src/designer/src/lib/shared/actioneditor.cpp | |
| parent | 1f2bed2bc8ce2c865b79c4948fba100b748c8bcb (diff) | |
| parent | d6c61e16437b5c31b73ada65471532625ae19ecc (diff) | |
Merge 5.4 into 5.4.1v5.4.1
Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a
Diffstat (limited to 'src/designer/src/lib/shared/actioneditor.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/actioneditor.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp index 07ffee2b6..91297ebd7 100644 --- a/src/designer/src/lib/shared/actioneditor.cpp +++ b/src/designer/src/lib/shared/actioneditor.cpp @@ -474,11 +474,6 @@ void ActionEditor::slotNewAction() } } -static inline bool isSameIcon(const QIcon &i1, const QIcon &i2) -{ - return i1.cacheKey() == i2.cacheKey(); -} - // return a FormWindow command to apply an icon or a reset command in case it // is empty. |