From d6244e6e5f8bb769176e07e957ec5ce93be72b55 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Wed, 30 Sep 2009 13:21:29 +0200 Subject: Compile on VS2003 The compiler complained about ambiguity in calls to make_pair because there is also a "using std::make_pair" in the WTF namespace (wtf/HashTraits.h). Reviewed-by: Simon Hausmann --- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp index 05e3d7b..f7bda9e 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Structure.cpp @@ -46,7 +46,6 @@ #define DO_PROPERTYMAP_CONSTENCY_CHECK 0 #endif -using namespace std; using namespace WTF; namespace JSC { -- cgit v0.12 From bdf7020103bc9698584005935f00cd874f841a49 Mon Sep 17 00:00:00 2001 From: Jan-Arve Date: Wed, 30 Sep 2009 13:39:49 +0200 Subject: Make the automaticReparenting autotest pass on Mac. On Mac, all autotests will use the release version of Qt, regardless of how the autotest was built --- tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp index feaedd9..69a64ee 100644 --- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp +++ b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp @@ -153,7 +153,7 @@ void tst_QGraphicsLayout::automaticReparenting() QGraphicsWidget *ww = new QGraphicsWidget(); QGraphicsLinearLayout *l1 = new QGraphicsLinearLayout(ww); -#ifdef QT_DEBUG +#if !defined(Q_OS_MAC) && defined(QT_DEBUG) QTest::ignoreMessage(QtWarningMsg, "QGraphicsLayout::addChildLayoutItem: QGraphicsWidget \"\"" " in wrong parent; moved to correct parent"); #endif -- cgit v0.12