aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/projectexplorer/applicationlauncher.cpp
diff options
context:
space:
mode:
authorNikita Baryshnikov <nib952051@gmail.com>2018-03-29 17:49:52 +0300
committerNikita Baryshnikov <nib952051@gmail.com>2018-04-03 15:57:49 +0000
commit0297cdd4f7094c592550f0cb08b3dacc81ae8430 (patch)
tree60ef3a3ddad3087f0ecf379c988ac1f99c6b2e0e /src/plugins/projectexplorer/applicationlauncher.cpp
parentb9d72a57376e7a41de2320f40363372248ebce21 (diff)
ApplicationLauncher: fix odr warning for State enum
applicationlauncher.cpp:68:6: warning: type ‘State’ violates the C++ One Definition Rule [-Wodr] enum State { Inactive, Run }; ^ deviceprocesslist.cpp:34:6: note: an enum with different value name is defined in another translation unit enum State { Inactive, Listing, Killing }; ^ Change-Id: I242754c1e4f18c5dd0e8bb017f94783528ad759f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/plugins/projectexplorer/applicationlauncher.cpp')
-rw-r--r--src/plugins/projectexplorer/applicationlauncher.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/applicationlauncher.cpp b/src/plugins/projectexplorer/applicationlauncher.cpp
index 65e00d32bc..5b5c84053e 100644
--- a/src/plugins/projectexplorer/applicationlauncher.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher.cpp
@@ -64,11 +64,11 @@ using namespace Internal;
namespace Internal {
-enum State { Inactive, Run };
class ApplicationLauncherPrivate : public QObject
{
public:
+ enum State { Inactive, Run };
explicit ApplicationLauncherPrivate(ApplicationLauncher *parent);
~ApplicationLauncherPrivate() { setFinished(); }