diff options
author | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
---|---|---|
committer | adjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-05-06 23:02:43 +0000 |
commit | 601ebdf6c4faea76016cf0d87d50abc260ca1569 (patch) | |
tree | cf601630c933447f2a369f6245f9a04b9a46b08a /src/autosaver.cpp | |
parent | Typographical and grammar corrections (diff) | |
parent | EBN Krazy fixes. 1st round.. (diff) | |
download | rekonq-601ebdf6c4faea76016cf0d87d50abc260ca1569.tar.xz |
Fixing conflicts merging master
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/autosaver.cpp')
-rw-r--r-- | src/autosaver.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/autosaver.cpp b/src/autosaver.cpp index 25bf9016..c7da12f3 100644 --- a/src/autosaver.cpp +++ b/src/autosaver.cpp @@ -20,14 +20,15 @@ -// Local Includes +// Self Includes #include "autosaver.h" +#include "autosaver.moc" // KDE Includes #include <KDebug> // Qt Includes -#include <QtCore> +#include <QtCore/QMetaObject> #define AUTOSAVE_IN 1000 * 3 // seconds |