diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-15 02:17:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-15 02:17:10 (GMT) |
| commit | 34fc612144f204d130307dc9d64657340a9d7f7d (patch) | |
| tree | bb32e8b03859273c72814deb6debcdc3566d32e3 /src | |
| parent | 86c6b7ec20bd1b9f208685cb1daa20ee144c6edd (diff) | |
| parent | d4f7cc91cdaee88db35fd74666d631d44c8dd4b7 (diff) | |
| download | Qt-34fc612144f204d130307dc9d64657340a9d7f7d.zip Qt-34fc612144f204d130307dc9d64657340a9d7f7d.tar.gz Qt-34fc612144f204d130307dc9d64657340a9d7f7d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
namespace fix
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qelapsedtimer_win.cpp | 6 | ||||
| -rw-r--r-- | src/gui/text/qfontdatabase.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/corelib/tools/qelapsedtimer_win.cpp b/src/corelib/tools/qelapsedtimer_win.cpp index cd076a6..d79dc5d 100644 --- a/src/corelib/tools/qelapsedtimer_win.cpp +++ b/src/corelib/tools/qelapsedtimer_win.cpp @@ -42,14 +42,14 @@ #include "qelapsedtimer.h" #include <windows.h> -// Result of QueryPerformanceFrequency, 0 indicates that the high resolution timer is unavailable -static quint64 counterFrequency = 0; - typedef ULONGLONG (WINAPI *PtrGetTickCount64)(void); static PtrGetTickCount64 ptrGetTickCount64 = 0; QT_BEGIN_NAMESPACE +// Result of QueryPerformanceFrequency, 0 indicates that the high resolution timer is unavailable +static quint64 counterFrequency = 0; + static void resolveLibs() { static bool done = false; diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp index 3762f39..26d9f2c 100644 --- a/src/gui/text/qfontdatabase.cpp +++ b/src/gui/text/qfontdatabase.cpp @@ -1130,13 +1130,14 @@ QT_BEGIN_INCLUDE_NAMESPACE #elif defined(Q_OS_SYMBIAN) # include "qfontdatabase_s60.cpp" #endif +QT_END_INCLUDE_NAMESPACE + #if !defined(Q_WS_X11) QString QFontDatabase::resolveFontFamilyAlias(const QString &family) { return family; } #endif -QT_END_INCLUDE_NAMESPACE static QtFontStyle *bestStyle(QtFontFoundry *foundry, const QtFontStyle::Key &styleKey, const QString &styleName = QString()) |