diff options
author | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-06-05 15:41:58 (GMT) |
---|---|---|
committer | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-06-05 15:41:58 (GMT) |
commit | e873cbdec9098856df2c2b584cee73ea0c5563ff (patch) | |
tree | 7d4bdc53f8c1b6da0c24772fe7908ce0271cf3a4 /src/qt3support | |
parent | 7e53a66171ee3358abe4b022ce0fa721259fa604 (diff) | |
parent | 9691523b796c6acc6a837a5f5a34fef16aa74c48 (diff) | |
download | Qt-e873cbdec9098856df2c2b584cee73ea0c5563ff.zip Qt-e873cbdec9098856df2c2b584cee73ea0c5563ff.tar.gz Qt-e873cbdec9098856df2c2b584cee73ea0c5563ff.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-graphicseffect
Diffstat (limited to 'src/qt3support')
-rw-r--r-- | src/qt3support/widgets/q3action.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qt3support/widgets/q3action.cpp b/src/qt3support/widgets/q3action.cpp index 311212a..caca47b 100644 --- a/src/qt3support/widgets/q3action.cpp +++ b/src/qt3support/widgets/q3action.cpp @@ -415,7 +415,7 @@ static QString qt_stripMenuText(QString s) s.remove(QLatin1String("...")); s.remove(QLatin1Char('&')); return s.trimmed(); -}; +} /*! Constructs an action called \a name with parent \a parent. |