Merge remote-tracking branch 'origin/3.4'

2015-03-26 12:51:06 +01:00
parent cb5886139e 4846040e56
commit 65cd5381d9
70 changed files with 786 additions and 366 deletions
--- a/src/libs/utils/macroexpander.cpp
+++ b/src/libs/utils/macroexpander.cpp
@@ -466,7 +466,7 @@ public:
    GlobalMacroExpander()
    {
        setDisplayName(MacroExpander::tr("Global variables"));
-        registerPrefix("Env", tr("Access environment variables."),
+        registerPrefix("Env", MacroExpander::tr("Access environment variables."),
           [](const QString &value) { return QString::fromLocal8Bit(qgetenv(value.toLocal8Bit())); });
    }
 };