Merge branch 'master' into 1.7

debian/changelog

@@ -1,5 +0,0 @@
-phantomjs (1.3-1~git20110703) unstable; urgency=low
-
-  * Initial release.
-
- -- Dennis Kaarsemaker <dennis@kaarsemaker.net>  Sun, 03 Jul 2011 20:45:52 +0200

debian/compat

@@ -1 +0,0 @@
-7

debian/control

@@ -1,24 +0,0 @@
-Source: phantomjs
-Section: python
-Priority: extra
-Maintainer: Dennis Kaarsemaker <dennis@kaarsemaker.net>
-Build-Depends: debhelper (>= 7), libqt4-dev (>= 4.6), libqtwebkit-dev, qt4-qmake, python-support (>= 0.6.4), python-all-dev (>= 2.5), python-qt4-dev, python-qt4
-Standards-Version: 3.8.4
-XS-Python-Version: >= 2.6
-Vcs-Git: http://github.com/ariya/phantomjs
-
-Package: phantomjs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: phantomjs - minimalistic headless WebKit-based JavaScript-driven tool
- PhantomJS is a minimalistic, headless, WebKit-based, JavaScript-driven tool.
- PhantomJs has native support for different web technologies: DOM handling,
- CSS selector, JSON, Canvas, SVG, and of course JavaScript.
-
-Package: python-pyphantomjs
-Architecture: all
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-qt4, python-argparse
-Description: phantomjs - minimalistic headless WebKit-based JavaScript-driven tool
- PhantomJS is a minimalistic, headless, WebKit-based, JavaScript-driven tool.
- PhantomJs has native support for different web technologies: DOM handling,
- CSS selector, JSON, Canvas, SVG, and of course JavaScript.

debian/copyright

@@ -1,35 +0,0 @@
-Format-Specification: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174&view=co&pathrev=174
-Name: phantomjs
-Maintainer: Dennis Kaarsemaker <dennis@kaarsemaker.net>
-Source: http://github.com/ariya/phantomjs
-
-Copyright: 2011 Ariya Hidayat <ariya.hidayat@gmail.com>
-License: BSD-3-clause
-
-Files: debian/*
-Copyright: 2011 Dennis Kaarsemaker <dennis@kaarsemaker.net>
-License: BSD-3-clause
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-   * Neither the name of the <organization> nor the
-     names of its contributors may be used to endorse or promote products
-     derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

debian/phantomjs.docs

@@ -1,2 +0,0 @@
-README.md
-examples

debian/phantomjs.install

@@ -1 +0,0 @@
-debian/tmp/usr/bin/phantomjs

debian/python-pyphantomjs.docs

@@ -1 +0,0 @@
-python/README.md

debian/python-pyphantomjs.install

@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/pyphantomjs
-debian/tmp/usr/lib

debian/rules

@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	qmake-qt4
-	$(MAKE)
-	cd python && python setup.py build
-
-override_dh_auto_install:
-	$(MAKE) install
-	mkdir -p debian/tmp/usr/bin
-	cp bin/* debian/tmp/usr/bin
-	cd python && python setup.py install --root=../debian/tmp --install-layout=deb
-
-override_dh_auto_clean:
-	if [ -f Makefile ]; then $(MAKE) distclean; fi
-	cd python && python setup.py clean

debian/source/format

@@ -1 +0,0 @@
-1.0

src/cookiejar.cpp

@@ -84,7 +84,7 @@ CookieJar::CookieJar(QString cookiesFile, QObject *parent)
     , m_cookieStorage(new QSettings(cookiesFile, QSettings::IniFormat, this))
     , m_enabled(true)
 {
-    QTimer::singleShot(0, this, SLOT(load()));
+    load();
 }
 
 // public: