summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-06-19 11:20:27 -0700
committerThiago Macieira <thiago.macieira@intel.com>2014-06-20 01:55:18 +0200
commitace322643b8fb4edde276de236a4d1a2b9af4846 (patch)
treecf8324478d75f7715cb2cd00a2936c721aa2ef43
parent334c134bb4fbcd56f13d6d4fee26e9d809a48db1 (diff)
Don't use QT_STATIC_CONST herev5.3.2
It makes no sense. Let's get rid of the macro. Change-Id: I82d56cd506cc041767889f6693e46aa44ed8eb7a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
-rw-r--r--src/activeqt/control/qaxservermain.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp
index 07156f4..382ead1 100644
--- a/src/activeqt/control/qaxservermain.cpp
+++ b/src/activeqt/control/qaxservermain.cpp
@@ -53,11 +53,11 @@ static bool qAxActivity = false;
static HANDLE hEventShutdown;
#ifdef QT_DEBUG
-QT_STATIC_CONST DWORD dwTimeOut = 1000;
-QT_STATIC_CONST DWORD dwPause = 500;
+static const DWORD dwTimeOut = 1000;
+static const DWORD dwPause = 500;
#else
-QT_STATIC_CONST DWORD dwTimeOut = 5000; // time for EXE to be idle before shutting down
-QT_STATIC_CONST DWORD dwPause = 1000; // time to wait for threads to finish up
+static const DWORD dwTimeOut = 5000; // time for EXE to be idle before shutting down
+static const DWORD dwPause = 1000; // time to wait for threads to finish up
#endif
extern HANDLE hEventShutdown;