From 8204a4db0506c3301c5eaeca491344f2d8c1ad32 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Fri, 12 Feb 2016 19:09:49 +0100
Subject: qmake: remove some empty user-defined dtors

They prevent move special member functions from
being synthesized by the compiler.

Change-Id: I90c4a6e286734ef3906ee833826bd3bfbdad3874
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
---
 qmake/generators/win32/msvc_objectmodel.cpp |  4 ----
 qmake/generators/win32/msvc_objectmodel.h   | 21 ++++++++-------------
 2 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'qmake')

diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index cc6e5754ec..5e655464b7 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -1758,10 +1758,6 @@ VCManifestTool::VCManifestTool()
 {
 }
 
-VCManifestTool::~VCManifestTool()
-{
-}
-
 bool VCManifestTool::parseOption(const char *option)
 {
     Q_UNUSED(option);
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 35aa288887..dfbfaacfa8 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -477,7 +477,7 @@ class VCCLCompilerTool : public VCToolBase
 public:
     // Functions
     VCCLCompilerTool();
-    virtual ~VCCLCompilerTool(){}
+
     bool parseOption(const char* option);
 
     // Variables
@@ -574,7 +574,7 @@ class VCLinkerTool : public VCToolBase
 public:
     // Functions
     VCLinkerTool();
-    virtual ~VCLinkerTool(){}
+
     bool parseOption(const char* option);
 
     // Variables
@@ -668,7 +668,7 @@ class VCManifestTool : public VCToolBase
 {
 public:
     VCManifestTool();
-    ~VCManifestTool();
+
     bool parseOption(const char* option);
 
     triState                EmbedManifest;
@@ -679,7 +679,7 @@ class VCMIDLTool : public VCToolBase
 public:
     // Functions
     VCMIDLTool();
-    virtual ~VCMIDLTool(){}
+
     bool parseOption(const char* option);
 
     // Variables
@@ -733,7 +733,7 @@ class VCLibrarianTool : public VCToolBase
 public:
     // Functions
     VCLibrarianTool();
-    virtual ~VCLibrarianTool(){}
+
     bool parseOption(const char*){ return false; }
 
     // Variables
@@ -754,7 +754,7 @@ class VCCustomBuildTool : public VCToolBase
 public:
     // Functions
     VCCustomBuildTool();
-    virtual ~VCCustomBuildTool(){}
+
     bool parseOption(const char*){ return false; }
 
     // Variables
@@ -773,7 +773,7 @@ class VCResourceCompilerTool : public VCToolBase
 public:
     // Functions
     VCResourceCompilerTool();
-    virtual ~VCResourceCompilerTool(){}
+
     bool parseOption(const char*){ return false; }
 
     // Variables
@@ -794,7 +794,6 @@ class VCDeploymentTool
 public:
     // Functions
     VCDeploymentTool();
-    virtual ~VCDeploymentTool() {}
 
     // Variables
     QString                 DeploymentTag;
@@ -808,7 +807,7 @@ class VCEventTool : public VCToolBase
 protected:
     // Functions
     VCEventTool(const QString &eventName);
-    virtual ~VCEventTool(){}
+
     bool parseOption(const char*){ return false; }
 
 public:
@@ -825,28 +824,24 @@ class VCPostBuildEventTool : public VCEventTool
 {
 public:
     VCPostBuildEventTool();
-    ~VCPostBuildEventTool(){}
 };
 
 class VCPreBuildEventTool : public VCEventTool
 {
 public:
     VCPreBuildEventTool();
-    ~VCPreBuildEventTool(){}
 };
 
 class VCPreLinkEventTool : public VCEventTool
 {
 public:
     VCPreLinkEventTool();
-    ~VCPreLinkEventTool(){}
 };
 
 class VCWinDeployQtTool : public VCToolBase
 {
 public:
     VCWinDeployQtTool() {}
-    ~VCWinDeployQtTool() {}
 
 protected:
     bool parseOption(const char *) { return false; }
-- 
cgit v1.2.3