diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2010-05-14 01:24:35 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2010-05-14 01:24:55 +0200 |
commit | 343a67e61ed6c85fc37a91cffa1926412cb097b7 (patch) | |
tree | 52f9e86dffece69c7dfb5bfe54a7a086cdc3f2fe /src/adblock/adblocknetworkreply.h | |
parent | Merge commit 'refs/merge-requests/2256' of git://gitorious.org/rekonq/mainlin... (diff) | |
parent | Move adblock rules conf file to appdata, to maintain central config file tiny (diff) | |
download | rekonq-343a67e61ed6c85fc37a91cffa1926412cb097b7.tar.xz |
Merge branch 'FixBlocks'
WARNING:
as we have a new adblock file, adblock will not work until
rekonq doesn't update subscriptions.
In some test installations, you can force rekonq doing it by removing
your $KDEHOME/share/config/rekonqrc file :)
Diffstat (limited to 'src/adblock/adblocknetworkreply.h')
-rw-r--r-- | src/adblock/adblocknetworkreply.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/adblock/adblocknetworkreply.h b/src/adblock/adblocknetworkreply.h index 14a0672c..16ba945a 100644 --- a/src/adblock/adblocknetworkreply.h +++ b/src/adblock/adblocknetworkreply.h @@ -71,7 +71,7 @@ class REKONQ_TESTS_EXPORT AdBlockNetworkReply : public QNetworkReply public: AdBlockNetworkReply(const QNetworkRequest &request, const QString &urlString, QObject *parent = 0); - void abort() {}; + void abort(); protected: qint64 readData(char *data, qint64 maxSize); |