Merge remote-tracking branch 'RockLi/add-command-option-disable-local-storage'
Fix including http:// in the proxy URL:
The proxy host parsed incorrectly, when it was typed with a scheme (http or https).
Now proxy can be specified with the scheme.

Fix invalid type conversion:
m_proxyPort converts to its ASCII representation.
Use `QString::number` to include a proxy port properly.

Issues:
https://github.com/ariya/phantomjs/issues/11117
https://github.com/ariya/phantomjs/issues/10811
Fix minor typos in preconfig.sh.

One is a typo, while the other is grammar-related.

fixes #11388

https://github.com/ariya/phantomjs/issues/11388
Unit test: tweak secure connection check.

The main wikipedia page can be slow to load and thus triggers the timeout.
Let's use the fast Google site so that we don't get flaky outcome.

Issue #10882: https://github.com/ariya/phantomjs/issues/10882
Unit tests: terminate any web servers after finishing the tests.

Issue #11163: https://github.com/ariya/phantomjs/issues/11163
Issue #11243: https://github.com/ariya/phantomjs/issues/11243
Unit tests: robustify the tests of PDF, GIF, PNG, JPEG rendering.

Issue #10973 https://github.com/ariya/phantomjs/issues/10973
Unit test: secure connection check becomes async.

Issue #10882: https://github.com/ariya/phantomjs/issues/10882
Unit tests: reduce the flakiness of loading progress tests.

For whatever reason, swapping the order with the render() tests solve the
intermittent random failures. Also, split the tests between loading
start and finish checks (to better recognize which one is failing, if
there is a failure), also make the tests more asynchoronous.

https://github.com/ariya/phantomjs/issues/11091
Include all the changes from 1.9.1.
Patch for table page break improvement.

From d78182d3a6451522f239ee1ecbb71863eb053792 Mon Sep 17 00:00:00 2001
From: Artem Baranovskiy <likejavascript@gmail.com>
Date: Mon, 6 May 2013 08:01:01 +0400
Subject: [PATCH] Table page-break improvements

See issue #11291 https://github.com/ariya/phantomjs/pull/11291
WebServer Headers for Request are treated case-insensitive

To achieve this, Request Headers are stored in both "original" and "lowercase".
In this way we don't mangle with the request object we have received, while
still be able to handle headers when NOT in the classic "Camel-Case" format.

Fixes #11421.
Merge pull request #11422 from detro/ghostdriver-dev

WebServer Headers for Request are treated case-insensitive
Fix typo in `loadurlwithoutcss` example

Issue: https://github.com/ariya/phantomjs/issues/11321
Merge pull request #11425 from Vitallium/master

Fix typo in the `loadurlwithoutcss` example
Use Qt::transparent to resolve graphical artifacts with images with transparent background.

We need to use QImage::Format_ARGB32_Premultiplied on Windows to preserve a text hinting and antialiasing. Using the function `qRgba()` leads to wrong pixel values on a target image. Since, `QImage::fill(uint pixel)` doesn't handle the QImage::Format_ARGB32_Premultiplied format, so we need to use the another overload `QImage::fill(const QColor &color)`

Issues:
https://github.com/ariya/phantomjs/issues/11276
https://github.com/ariya/phantomjs/issues/11007
https://github.com/ariya/phantomjs/issues/11366
Merge branch 'master' of git://github.com/ariya/phantomjs
Merge branch 'master' of github.com:WoZ/phantomjs