diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-06-26 17:43:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-26 18:17:15 +0200 |
| commit | d5c0a5139ba0c9731dd62ecba511412d927f99ac (patch) | |
| tree | a41a8ed3336ba5487ddcb736c5017a3245985ab2 | |
| parent | 5e3ad4bb0c325786286325662d1e62e42dbb4143 (diff) | |
| parent | d6ae82a9beae009cfcdb401358712f289141497e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
| -rw-r--r-- | src/activeqt/control/qaxservermain.cpp | 8 |
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; |