From 26877d990b5f0c242448690ca957e98d64ae40e3 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Mon, 20 Jun 2011 11:50:18 +0200
Subject: Support -qtnamespace and -qtlibinfix again

This fix is for qtbase libraries with -qtnamespace and -qtlibinfix
options in configure.

Task-number: QTBUG-19964
Change-Id: I2f2ff1748f2c1c2b20d5f73b6be36f68a7a26cef
Reviewed-on: http://codereview.qt.nokia.com/505
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---
 src/gui/util/qscroller_mac.mm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/gui/util')

diff --git a/src/gui/util/qscroller_mac.mm b/src/gui/util/qscroller_mac.mm
index c0ef4a1665..81d18aaf6b 100644
--- a/src/gui/util/qscroller_mac.mm
+++ b/src/gui/util/qscroller_mac.mm
@@ -47,6 +47,8 @@
 
 #include "qscroller_p.h"
 
+QT_BEGIN_NAMESPACE
+
 QPointF QScrollerPrivate::realDpi(int screen)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
@@ -68,4 +70,6 @@ QPointF QScrollerPrivate::realDpi(int screen)
     [pool release];
 }
 
+QT_END_NAMESPACE
+
 #endif
-- 
cgit v1.2.3