diff options
| author | Xizhi Zhu <xizhi.zhu@nokia.com> | 2011-11-02 10:29:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-03 12:17:28 +0100 |
| commit | a928afd9149c746400ba48a173b76fe2f8882753 (patch) | |
| tree | 38645a25c9f2fce30534eb362aed819bf6e156f8 /src/systeminfo/qscreensaver.cpp | |
| parent | 2edee608c5ecde146b9c6336e9f4b979267163aa (diff) | |
Refactor the screen saver code for Linux.
Merge JsonDb based and X11 based code into one file.
Use compile test to check if X11 is available.
Change-Id: I0ec7772457437744293f3fccec7e2628a88cd9f7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Steffen Hahn <steffen.hahn@nokia.com>
Reviewed-by: Cristiano di Flora <cristiano.di-flora@nokia.com>
Diffstat (limited to 'src/systeminfo/qscreensaver.cpp')
| -rw-r--r-- | src/systeminfo/qscreensaver.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/systeminfo/qscreensaver.cpp b/src/systeminfo/qscreensaver.cpp index f6e1d7b1..29b68ebc 100644 --- a/src/systeminfo/qscreensaver.cpp +++ b/src/systeminfo/qscreensaver.cpp @@ -42,11 +42,7 @@ #include <qscreensaver.h> #if defined(Q_OS_LINUX) -# if !defined(QT_NO_JSONDB) -# include "qscreensaver_jsondb_p.h" -# else -# include "qscreensaver_linux_p.h" -# endif // QT_NO_JSONDB +#include "qscreensaver_linux_p.h" #elif defined(Q_OS_WIN) # include "qscreensaver_win_p.h" #else |