From cbffa57351cdbdd189cf8251fdab0b62690fa33a Mon Sep 17 00:00:00 2001
From: Alain Linden <alain@lindenlab.com>
Date: Fri, 4 Feb 2011 12:52:36 -0800
Subject: fix linking to llqtwebkit.
---
indra/cmake/WebKitLibPlugin.cmake | 1 +
indra/llcommon/tests/llsdserialize_test.cpp | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
(limited to 'indra')
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index 1f5b0f5d84..1cc02c1cac 100644
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -35,6 +35,7 @@ else (STANDALONE)
endif (STANDALONE)
if (WINDOWS)
+ use_prebuilt_binary(qt)
set(WEBKIT_PLUGIN_LIBRARIES
debug llqtwebkitd
debug QtWebKitd4
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 770443da1d..7b4c7d6a48 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -452,7 +452,7 @@ namespace tut
checkRoundTrip(msg + " nested arrays", v);
v = LLSD::emptyMap();
- fillmap(v, 10, 6); // 10^6 maps
+ fillmap(v, 10, 3); // 10^6 maps
checkRoundTrip(msg + " many nested maps", v);
}
--
cgit v1.2.3