diff options
| author | Frank Reininghaus <[email protected]> | 2013-05-11 18:47:58 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2013-05-11 18:47:58 +0200 |
| commit | cad78cdfcf1f3b76acaadc7e9394df3ef466d770 (patch) | |
| tree | c20bd592150467d0f306a748258492ebe78ade8b /src/views | |
| parent | f9990aff6a087bf5e7225810e200fdd26a9d7a3e (diff) | |
| parent | f6fcf4be851e82e13a60f469e10b207a2c7facba (diff) | |
Merge remote-tracking branch 'origin/KDE/4.10'
Conflicts:
CMakeLists.txt
Diffstat (limited to 'src/views')
| -rw-r--r-- | src/views/dolphinviewactionhandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index c7832d725..730723785 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -528,8 +528,10 @@ void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role) if (action) { action->setChecked(true); - QAction* sortByMenu = m_actionCollection->action("sort"); - sortByMenu->setIcon(KIcon(action->icon())); + if (!action->icon().isNull()) { + QAction* sortByMenu = m_actionCollection->action("sort"); + sortByMenu->setIcon(KIcon(action->icon())); + } } } |