[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: Merge remote-tracking branch 'origin/KDE/4.10'
From:       Montel Laurent <montel () kde ! org>
Date:       2013-02-01 7:17:45
Message-ID: 20130201071745.952BDA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 1289d77caae6b24a83a700427346a1a1b758a131 by Montel Laurent.
Committed on 01/02/2013 at 08:17.
Pushed by mlaurent into branch 'master'.

Merge remote-tracking branch 'origin/KDE/4.10'

M  +1    -1    kmail/tagactionmanager.cpp
M  +1    -1    kmail/tagactionmanager.h
M  +11   -16   messagecomposer/attachmentcontrollerbase.cpp

http://commits.kde.org/kdepim/1289d77caae6b24a83a700427346a1a1b758a131

diff --cc kmail/tagactionmanager.h
index baf8f9b,f59cf68..34929f4
--- a/kmail/tagactionmanager.h
+++ b/kmail/tagactionmanager.h
@@@ -131,9 -127,8 +131,9 @@@ namespace KMail =

        QSignalMapper *mMessageTagToggleMapper;
        KXMLGUIClient *mGUIClient;
  =

-       KAction *mSeparatorAction;
+       QAction *mSeparatorAction;
        KAction *mMoreAction;
 +      KAction *mNewTagAction;
        // Maps the resource URI or a tag to the action of a tag.
        // Contains all existing tags
        QMap<QString,KToggleAction*> mTagActions;
[prev in list] [next in list] [prev in thread] [next in thread]