diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-10-23 14:52:21 +0000 |
| commit | 6dc839d3445e66b259361f08838a8c05b1912e68 (patch) | |
| tree | 5ef88f8fe4cb6f75cf0a1c1e821945c7186491c7 /pkgs/applications/networking/browsers/konq-plugins/qt47.patch | |
| parent | 4309788df022c89765cd7f6b178f4ce7a08db600 (diff) | |
| parent | 327a2eae30b48277bd453842d03a144f618822b2 (diff) | |
| download | nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.gz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.bz2 nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.lz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.xz nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.tar.zst nixlib-6dc839d3445e66b259361f08838a8c05b1912e68.zip | |
Merging from trunk. I resolved some conflicts; I hope that well.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24429
Diffstat (limited to 'pkgs/applications/networking/browsers/konq-plugins/qt47.patch')
| -rw-r--r-- | pkgs/applications/networking/browsers/konq-plugins/qt47.patch | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/konq-plugins/qt47.patch b/pkgs/applications/networking/browsers/konq-plugins/qt47.patch new file mode 100644 index 000000000000..2039d293eb32 --- /dev/null +++ b/pkgs/applications/networking/browsers/konq-plugins/qt47.patch @@ -0,0 +1,11 @@ +--- konq-plugins/adblock/adblock.cpp 2010-02-11 22:12:41.000000000 +0000 ++++ konq-plugins/adblock/adblock.cpp 2010-07-26 17:12:20.639786002 +0100 +@@ -300,7 +300,7 @@ + // ---------------------------------------------------------------------------- + + AdElement::AdElement() : +- m_url(0), m_category(0), m_type(0), m_blocked(false) {} ++ m_url(QString()), m_category(QString()), m_type(QString()), m_blocked(false) {} + + AdElement::AdElement(const QString &url, const QString &category, + const QString &type, bool blocked, const DOM::Node&node) : |