diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-19 12:30:32 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-07 03:51:41 +0200 |
| commit | 11c30f9705e796ebabcdd868bce3ad3664cc06eb (patch) | |
| tree | c7c95ff9c74dd41c2168fb51306af077a8a3daea /src/tools/qdoc/location.h | |
| parent | 1d111091b5906bd9067d8c8510fc9a7fc2af10aa (diff) | |
Remove QT_STATIC_CONST
This macro is no longer used. It was introduced probably by mistake,
due to MSVC not following the strict string requirement of the C and
C++ standards by default (you can assign a string literal to a
non-const char*).
Change-Id: I4b221dd435191b0eea689dbed35915cf3206648b
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/tools/qdoc/location.h')
| -rw-r--r-- | src/tools/qdoc/location.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/location.h b/src/tools/qdoc/location.h index 0c113bcbeb..d5ea5a6af0 100644 --- a/src/tools/qdoc/location.h +++ b/src/tools/qdoc/location.h @@ -90,7 +90,7 @@ public: void fatal(const QString& message, const QString& details = QString()) const; - QT_STATIC_CONST Location null; + static const Location null; static void initialize(const Config& config); static void terminate(); |