diff options
author | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 10:26:40 +0300 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2017-03-30 10:34:22 +0300 |
commit | a42a15779a4c75431add40f0b88fc57c591b1efa (patch) | |
tree | 74f97639b2d39be0599f4239f67121bdde846415 /src/libs/installer/elevatedexecuteoperation.cpp | |
parent | 2385184b8b1aeaac6d0b42739b44c4786a6e9cab (diff) | |
parent | 7e91db5b1e01ffeeaa566ebb5b8230dcdc6b514f (diff) |
Merge remote-tracking branch 'origin/3.0'
Change-Id: Ic3c8005de03b2cc71436aaa18486085a845dca78
Diffstat (limited to 'src/libs/installer/elevatedexecuteoperation.cpp')
-rw-r--r-- | src/libs/installer/elevatedexecuteoperation.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/libs/installer/elevatedexecuteoperation.cpp b/src/libs/installer/elevatedexecuteoperation.cpp index e0f326a33..2cc988a4d 100644 --- a/src/libs/installer/elevatedexecuteoperation.cpp +++ b/src/libs/installer/elevatedexecuteoperation.cpp @@ -31,9 +31,10 @@ #include "environment.h" #include "qprocesswrapper.h" -#include <QtCore/QThread> -#include <QtCore/QProcessEnvironment> #include <QtCore/QDebug> +#include <QtCore/QProcessEnvironment> +#include <QtCore/QRegExp> +#include <QtCore/QThread> using namespace QInstaller; |