livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix linking to llqtwebkit.

master
Alain Linden 2011-02-04 12:52:36 -08:00
parent 3f78394f42
commit cbffa57351
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
autobuild.xml
View File

@ -606,9 +606,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>1135a4afc4328c68368f550ede28b4dd</string>
<string>ba33d49b86528e1897b9857f245176fb</string>
<key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/glui-2.3.6-windows-freeglut-20101001b.tar.bz2</string>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs//glui-2.36-windows-20110203.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1066,7 +1066,7 @@
<key>license</key>
<string>lgpl</string>
<key>license_file</key>
<string>LICENSES/llqtwebkit.txt</string>
<string>LICENSES/LLQTWEBKIT_LICENSE.txt</string>
<key>name</key>
<string>llqtwebkit</string>
<key>platforms</key>
@ -1100,9 +1100,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>77889b3d6aae9419ee973b326337738b</string>
<string>5744e07b1b775afd259f3916a436c54c</string>
<key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-windows-20110127a.tar.bz2</string>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.7.1-windows-20110204.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -1389,6 +1389,30 @@
</map>
</map>
</map>
<key>qt</key>
<map>
<key>license</key>
<string>LGPL</string>
<key>license_file</key>
<string>LICENSES/qt.txt</string>
<key>name</key>
<string>qt</string>
<key>platforms</key>
<map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>5ebf518be8ca8913265d791096e21445</string>
<key>url</key>
<string>file:///cygwin/home/Alain/projects/qt/qt-4.7.1-windows-20110203.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
</map>
</map>
<key>quicktime</key>
<map>
<key>license</key>

1
indra/cmake/WebKitLibPlugin.cmake
View File

@ -35,6 +35,7 @@ else (STANDALONE)
endif (STANDALONE)
if (WINDOWS)
use_prebuilt_binary(qt)
set(WEBKIT_PLUGIN_LIBRARIES
debug llqtwebkitd
debug QtWebKitd4

2
indra/llcommon/tests/llsdserialize_test.cpp
View File

@ -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);
}