diff -u5rwB --exclude=qt --exclude=Makefile --exclude='Makefile.*' --exclude='*.prl' QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/build.cmd QtWeb/build.cmd
--- QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/build.cmd	2013-06-12 15:43:34.000000000 +0800
+++ QtWeb/build.cmd	2013-06-20 11:39:45.417750000 +0800
@@ -1,18 +1,21 @@
-call env.cmd
+@echo off
+::call env.cmd
 
 cd src\qt\
+goto next
 ..\..\bin\patch.exe -p0 -N < ..\..\qt-patches\0001-configure.patch
 ..\..\bin\patch.exe -p0 -N < ..\..\qt-patches\0002-webkit-pro.patch
 ..\..\bin\patch.exe -p0 -N < ..\..\qt-patches\0003-qtwebkit-pro.patch
 ..\..\bin\patch.exe -p0 -N < ..\..\qt-patches\0004-qstyles-qrc.patch
 ..\..\bin\patch.exe -p0 -N < ..\..\qt-patches\0005-qwidget-cpp.patch
 ..\..\bin\patch.exe -p0 -N < ..\..\qt-patches\0006-webkit-disable-npapi.patch
 ..\..\bin\patch.exe -p0 -N < ..\..\qt-patches\0011-windows-mkspec.patch
 ..\..\bin\patch.exe -p0 -N < ..\..\qt-patches\0012-windows-webcore-pro.patch
 ..\..\bin\patch.exe -p0 -N < ..\..\qt-patches\0013-windows-dotnet-style.patch
 
+:next
 set OPTIONS=
 set OPTIONS=%OPTIONS% -opensource
 set OPTIONS=%OPTIONS% -confirm-license
 set OPTIONS=%OPTIONS% -static
 set OPTIONS=%OPTIONS% -webkit
@@ -45,15 +48,21 @@
 set OPTIONS=%OPTIONS% -no-style-cde
 set OPTIONS=%OPTIONS% -no-s60
 set OPTIONS=%OPTIONS% -mp
 set OPTIONS=%OPTIONS% -no-accessibility
 
-configure -prefix %cd% %OPTIONS% && nmake
+configure -prefix %cd% %OPTIONS% && jom
+
+goto :EOF
+
+
 ..\..\bin\patch.exe -p0 -R < ..\..\qt-patches\0001-configure.patch
 ..\..\bin\patch.exe -p0 -R < ..\..\qt-patches\0002-webkit-pro.patch
 ..\..\bin\patch.exe -p0 -R < ..\..\qt-patches\0003-qtwebkit-pro.patch
 ..\..\bin\patch.exe -p0 -R < ..\..\qt-patches\0004-qstyles-qrc.patch
 ..\..\bin\patch.exe -p0 -R < ..\..\qt-patches\0005-qwidget-cpp.patch
 ..\..\bin\patch.exe -p0 -R < ..\..\qt-patches\0006-webkit-disable-npapi.patch
 ..\..\bin\patch.exe -p0 -R < ..\..\qt-patches\0012-windows-webcore-pro.patch
 ..\..\bin\patch.exe -p0 -R < ..\..\qt-patches\0013-windows-dotnet-style.patch
-src\qt\bin\qmake.exe -config release && nmake clean && nmake
+
+::cd ..\..
+::src\qt\bin\qmake.exe -config release && jom clean && jom
diff -u5rwB --exclude=qt --exclude=Makefile --exclude='Makefile.*' --exclude='*.prl' QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/env.cmd QtWeb/env.cmd
--- QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/env.cmd	2013-06-12 15:43:34.000000000 +0800
+++ QtWeb/env.cmd	2013-06-18 17:16:14.949375000 +0800
@@ -1,26 +1,30 @@
 @ECHO OFF
  
 set QTDIR=%cd%\src\qt\
+set SQLITE3SRCDIR=%QTDIR%\src\3rdparty\sqlite
+::set QMAKEPATH=G:\QtWeb\qtwebkit23\Tools\qmake
 set PATH=%SystemRoot%;%SystemRoot%\system32;%QTDIR%\bin;%PATH%
  
 echo Setting OpenSSL Env.
 set OPENSSL=%cd%\src\qt\openssl\
 set PATH=%OPENSSL%\bin;%PATH%
 set LIB=%OPENSSL%\lib
 set INCLUDE=%OPENSSL%\include
  
 echo Setting Windows SDK Env.
-set WindowsSdkDir=C:\Program Files\Microsoft SDKs\Windows\v7.1\
+set WindowsSdkDir=F:\Microsoft SDKs\Windows\v6.1\
 set PATH=%WindowsSdkDir%\Bin;%PATH%
 set LIB=%WindowsSdkDir%\Lib;%LIB%
 set INCLUDE=%WindowsSdkDir%\Include;%INCLUDE%
 set TARGET_CPU=x86
  
 echo Setting MSVC2010 Env.
-set VSINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 10.0\
-set VCINSTALLDIR=C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC
+::set VSINSTALLDIR=C:\Program Files\Microsoft Visual Studio 9.0\
+::set VCINSTALLDIR=C:\Program Files\Microsoft Visual Studio 9.0\VC\
+set VSINSTALLDIR=F:\Microsoft Visual Studio 8\
+set VCINSTALLDIR=F:\Microsoft Visual Studio 8\VC\
 set DevEnvDir=%VSINSTALLDIR%\Common7\IDE
 set PATH=%VCINSTALLDIR%\bin;%VSINSTALLDIR%\Common7\Tools;%VSINSTALLDIR%\Common7\IDE;%VCINSTALLDIR%\VCPackages;%PATH%
 set INCLUDE=%VCINSTALLDIR%\include;%INCLUDE%
 set LIB=%VCINSTALLDIR%\lib;%LIB%
 set LIBPATH=%VCINSTALLDIR%\lib
diff -u5rwB --exclude=qt --exclude=Makefile --exclude='Makefile.*' --exclude='*.prl' QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/QtWeb.pro QtWeb/src/QtWeb.pro
--- QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/QtWeb.pro	2013-06-12 15:43:34.000000000 +0800
+++ QtWeb/src/QtWeb.pro	2013-06-15 16:39:56.119875000 +0800
@@ -1,9 +1,9 @@
 TEMPLATE = app
 TARGET = QtWeb
 DESTDIR = ../build
-QT += network xml webkit
+QT += network xml xmlpatterns webkit
 CONFIG += static
 QTPLUGIN += qcncodecs qjpcodecs qkrcodecs qtwcodecs qico 
 DEFINES += QT_NO_UITOOLS
 
 INCLUDEPATH += $$DESTDIR/moc \
diff -u5rwB --exclude=qt --exclude=Makefile --exclude='Makefile.*' --exclude='*.prl' QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/browserapplication.cpp QtWeb/src/browserapplication.cpp
--- QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/browserapplication.cpp	2013-06-12 15:43:34.000000000 +0800
+++ QtWeb/src/browserapplication.cpp	2013-06-15 19:56:40.885125000 +0800
@@ -350,10 +350,20 @@
                         {
                             mainWindow()->loadPage( args[2] );
                             mainWindow()->setDumpFile(args[3] , (command == "-dump_and_quit"));
                         }
                     }
+                    else if(command == "--incognito")
+                    {
+                        QWebSettings *globalSettings = QWebSettings::globalSettings();
+                        globalSettings->setAttribute(QWebSettings::PrivateBrowsingEnabled, true);
+                        settings.endGroup();
+                        settings.beginGroup(QLatin1String("privacy"));
+                        settings.setValue(QLatin1String("private_browsing"), true);
+                        settings.endGroup();
+                        mainWindow()->loadPage(args.last());
+                    }
                     else
                     {
                         mainWindow()->loadPage(args.last());
                     }
                     break;
diff -u5rwB --exclude=qt --exclude=Makefile --exclude='Makefile.*' --exclude='*.prl' QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/browsermainwindow.cpp QtWeb/src/browsermainwindow.cpp
--- QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/browsermainwindow.cpp	2013-06-12 15:43:34.000000000 +0800
+++ QtWeb/src/browsermainwindow.cpp	2013-06-21 10:41:58.014750000 +0800
@@ -1084,12 +1084,13 @@
     alignmentGroup->addAction(menuAddEncoding("Chinese Simplified",     "GB2312"));
     alignmentGroup->addAction(menuAddEncoding("Chinese Traditional",    "Big5"));
     // korean
     alignmentGroup->addAction(menuAddEncoding("Korean", "EUC-KR"));
     // japanese
-    alignmentGroup->addAction(menuAddEncoding("Japanese",   "ISO-2022-JP"));
+    alignmentGroup->addAction(menuAddEncoding("Japanese",   "Shift_JIS"));
     alignmentGroup->addAction(menuAddEncoding("Japanese",   "EUC-JP"));
+    alignmentGroup->addAction(menuAddEncoding("Japanese",   "ISO-2022-JP"));
     m_encodingMenu->addSeparator();
 
     alignmentGroup->addAction(menuAddEncoding("Cyrillic",   "ISO-8859-5"));
     alignmentGroup->addAction(menuAddEncoding("Cyrillic",   "KOI8-U"));
     m_encodingMenu->addSeparator();
@@ -2381,10 +2382,11 @@
 
     WebView *view = currentTab();
     if (!view)
         return;
 
+    QWebSettings::globalSettings()->setDefaultTextEncoding(m_currentEncoding);
     view->reload();
 
 }
 
 void BrowserMainWindow::slotAboutToShowPrivacyMenu()
diff -u5rwB --exclude=qt --exclude=Makefile --exclude='Makefile.*' --exclude='*.prl' QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/main.cpp QtWeb/src/main.cpp
--- QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/main.cpp	2013-06-12 15:43:34.000000000 +0800
+++ QtWeb/src/main.cpp	2013-06-15 16:39:53.604250000 +0800
@@ -55,11 +55,11 @@
     Q_INIT_RESOURCE(data);
     Q_INIT_RESOURCE(icons);
 
 #ifndef QT_SHARED
     Q_INIT_RESOURCE(WebCore);
-    Q_INIT_RESOURCE(InspectorBackendStub);
+    Q_INIT_RESOURCE(InspectorBackendCommands);
     Q_INIT_RESOURCE(WebKit);
 #endif
 
     BrowserApplication application(argc, argv);
     if (!application.isTheOnlyBrowser())
diff -u5rwB --exclude=qt --exclude=Makefile --exclude='Makefile.*' --exclude='*.prl' QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/webpage.cpp QtWeb/src/webpage.cpp
--- QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/webpage.cpp	2013-06-12 15:43:34.000000000 +0800
+++ QtWeb/src/webpage.cpp	2013-06-15 18:46:09.366500000 +0800
@@ -209,11 +209,11 @@
     // Language
     ua.append(name);
     ua.append(QLatin1String(") "));
 
     // webkit/qt version
-    ua.append(QLatin1String("AppleWebKit/534.34 (KHTML, like Gecko) "));
+    ua.append(QLatin1String("AppleWebKit/537.21 (KHTML, like Gecko) "));
 
     // Application name/version
     QString appName = QCoreApplication::applicationName();
     if (!appName.isEmpty()) {
         ua.append(QLatin1Char(' ') + appName);
diff -u5rwB --exclude=qt --exclude=Makefile --exclude='Makefile.*' --exclude='*.prl' QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/webview.cpp QtWeb/src/webview.cpp
--- QtWeb-fe40ce4aa146f5292b69bc957e88e3d20a93a9db/src/webview.cpp	2013-06-12 15:43:34.000000000 +0800
+++ QtWeb/src/webview.cpp	2013-06-21 10:40:22.280375000 +0800
@@ -307,11 +307,11 @@
     emit statusBarMessage ( status )  ;
 }
 
 void WebView::applyEncoding()
 {
-    if (m_encoding_in_progress)
+    /*if (m_encoding_in_progress)
         return;
 
     if (webPage() && webPage()->mainWindow())
     {
         QString enc = webPage()->mainWindow()->m_currentEncoding;
@@ -351,11 +351,11 @@
             html = frame->toHtml();
             output = decoder->toUnicode(html.toAscii());
             frame->setHtml(output, frame->url());
         }
         m_encoding_in_progress = false;
-    }
+    }*/
 }
 
 
 void WebView::loadFinishedCustom(bool ok)
 {
