Skip to content
Snippets Groups Projects
Commit 88e2f351 authored by mae's avatar mae
Browse files

Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

parents 0df94d51 d72b4994
No related branches found
No related tags found
No related merge requests found
...@@ -72,7 +72,7 @@ VersionDialog::VersionDialog(QWidget *parent) ...@@ -72,7 +72,7 @@ VersionDialog::VersionDialog(QWidget *parent)
"<br/>" "<br/>"
"Built on " __DATE__ " at " __TIME__ "<br />" "Built on " __DATE__ " at " __TIME__ "<br />"
#ifdef IDE_REVISION #ifdef IDE_REVISION
"Using revision %5<br/>" "From revision %5<br/>"
#endif #endif
"<br/>" "<br/>"
"<br/>" "<br/>"
......
...@@ -54,8 +54,8 @@ class OpenDocumentsFilter : public QuickOpen::IQuickOpenFilter ...@@ -54,8 +54,8 @@ class OpenDocumentsFilter : public QuickOpen::IQuickOpenFilter
public: public:
OpenDocumentsFilter(Core::EditorManager *editorManager); OpenDocumentsFilter(Core::EditorManager *editorManager);
QString trName() const { return tr("Open document"); } QString trName() const { return tr("Open documents"); }
QString name() const { return "Open document"; } QString name() const { return "Open documents"; }
QuickOpen::IQuickOpenFilter::Priority priority() const { return QuickOpen::IQuickOpenFilter::Medium; } QuickOpen::IQuickOpenFilter::Priority priority() const { return QuickOpen::IQuickOpenFilter::Medium; }
QList<QuickOpen::FilterEntry> matchesFor(const QString &entry); QList<QuickOpen::FilterEntry> matchesFor(const QString &entry);
void accept(QuickOpen::FilterEntry selection) const; void accept(QuickOpen::FilterEntry selection) const;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment