1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qmake: remove some empty user-defined dtors

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

Change-Id: I90c4a6e286734ef3906ee833826bd3bfbdad3874
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
This commit is contained in:
Marc Mutz 2016-02-12 19:09:49 +01:00
parent 1a358a052e
commit 8204a4db05
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/generators/win32/msvc_objectmodel.cpp
View File

@ -1758,10 +1758,6 @@ VCManifestTool::VCManifestTool()
{ {
} }
VCManifestTool::~VCManifestTool()
{
}
bool VCManifestTool::parseOption(const char *option) bool VCManifestTool::parseOption(const char *option)
{ {
Q_UNUSED(option); Q_UNUSED(option);

21
qmake/generators/win32/msvc_objectmodel.h
View File

@ -477,7 +477,7 @@ class VCCLCompilerTool : public VCToolBase
public: public:
// Functions // Functions
VCCLCompilerTool(); VCCLCompilerTool();
virtual ~VCCLCompilerTool(){}
bool parseOption(const char* option); bool parseOption(const char* option);
// Variables // Variables
@ -574,7 +574,7 @@ class VCLinkerTool : public VCToolBase
public: public:
// Functions // Functions
VCLinkerTool(); VCLinkerTool();
virtual ~VCLinkerTool(){}
bool parseOption(const char* option); bool parseOption(const char* option);
// Variables // Variables
@ -668,7 +668,7 @@ class VCManifestTool : public VCToolBase
{ {
public: public:
VCManifestTool(); VCManifestTool();
~VCManifestTool();
bool parseOption(const char* option); bool parseOption(const char* option);
triState EmbedManifest; triState EmbedManifest;
@ -679,7 +679,7 @@ class VCMIDLTool : public VCToolBase
public: public:
// Functions // Functions
VCMIDLTool(); VCMIDLTool();
virtual ~VCMIDLTool(){}
bool parseOption(const char* option); bool parseOption(const char* option);
// Variables // Variables
@ -733,7 +733,7 @@ class VCLibrarianTool : public VCToolBase
public: public:
// Functions // Functions
VCLibrarianTool(); VCLibrarianTool();
virtual ~VCLibrarianTool(){}
bool parseOption(const char*){ return false; } bool parseOption(const char*){ return false; }
// Variables // Variables
@ -754,7 +754,7 @@ class VCCustomBuildTool : public VCToolBase
public: public:
// Functions // Functions
VCCustomBuildTool(); VCCustomBuildTool();
virtual ~VCCustomBuildTool(){}
bool parseOption(const char*){ return false; } bool parseOption(const char*){ return false; }
// Variables // Variables
@ -773,7 +773,7 @@ class VCResourceCompilerTool : public VCToolBase
public: public:
// Functions // Functions
VCResourceCompilerTool(); VCResourceCompilerTool();
virtual ~VCResourceCompilerTool(){}
bool parseOption(const char*){ return false; } bool parseOption(const char*){ return false; }
// Variables // Variables
@ -794,7 +794,6 @@ class VCDeploymentTool
public: public:
// Functions // Functions
VCDeploymentTool(); VCDeploymentTool();
virtual ~VCDeploymentTool() {}
// Variables // Variables
QString DeploymentTag; QString DeploymentTag;
@ -808,7 +807,7 @@ class VCEventTool : public VCToolBase
protected: protected:
// Functions // Functions
VCEventTool(const QString &eventName); VCEventTool(const QString &eventName);
virtual ~VCEventTool(){}
bool parseOption(const char*){ return false; } bool parseOption(const char*){ return false; }
public: public:
@ -825,28 +824,24 @@ class VCPostBuildEventTool : public VCEventTool
{ {
public: public:
VCPostBuildEventTool(); VCPostBuildEventTool();
~VCPostBuildEventTool(){}
}; };
class VCPreBuildEventTool : public VCEventTool class VCPreBuildEventTool : public VCEventTool
{ {
public: public:
VCPreBuildEventTool(); VCPreBuildEventTool();
~VCPreBuildEventTool(){}
}; };
class VCPreLinkEventTool : public VCEventTool class VCPreLinkEventTool : public VCEventTool
{ {
public: public:
VCPreLinkEventTool(); VCPreLinkEventTool();
~VCPreLinkEventTool(){}
}; };
class VCWinDeployQtTool : public VCToolBase class VCWinDeployQtTool : public VCToolBase
{ {
public: public:
VCWinDeployQtTool() {} VCWinDeployQtTool() {}
~VCWinDeployQtTool() {}
protected: protected:
bool parseOption(const char *) { return false; } bool parseOption(const char *) { return false; }