Merge remote-tracking branch 'origin/4.0' into 4.1

Change-Id: I71d3064a5f65ec658a7ecf248bdce0a3aeea89f4

share/qtcreator/debugger/gdbbridge.py

@@ -256,11 +256,6 @@ class Dumper(DumperBase):
         self.qtNamespaceToReport = None
         self.interpreterBreakpointResolvers = []
 
-        # The guess does not need to be updated during a fetchVariables()
-        # as the result is fixed during that time (ignoring "active"
-        # dumpers causing loading of shared objects etc).
-        self.currentQtNamespaceGuess = None
-
     def prepare(self, args):
         self.output = []
         self.currentIName = ""
@@ -294,6 +289,11 @@ class Dumper(DumperBase):
         #warn("EXPANDED INAMES: %s" % self.expandedINames)
         #warn("WATCHERS: %s" % self.watchers)
 
+        # The guess does not need to be updated during a fetchVariables()
+        # as the result is fixed during that time (ignoring "active"
+        # dumpers causing loading of shared objects etc).
+        self.currentQtNamespaceGuess = None
+
     def listOfLocals(self):
         frame = gdb.selected_frame()
 

tests/manual/proparser/main.cpp

@@ -189,6 +189,8 @@ int main(int argc, char **argv)
         qCritical("usage: testreader [-v] [-d [-d]] [-c] <filenme> [<out_pwd>] [<variable assignments>]");
         return 3;
     }
+    option.commitCommandLineArguments(state);
+    option.useEnvironment();
     if (out_pwd.isEmpty())
         out_pwd = in_pwd;
     option.setDirectories(in_pwd, out_pwd);