diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-07 11:29:44 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-01-07 12:55:45 +0100 |
| commit | 49d3fe90aea461d4cbb1ef1ff755642fdce9f18a (patch) | |
| tree | 066730c18d3b81765dd3ba754d9a698c3509b757 | |
| parent | 2174f117fe67c9e6be21c52003a436e866755fc3 (diff) | |
Fix compilation of the QtSingleApplication solution with Qt 5.
Change-Id: I48c20f8b96306d56bb6c365f6cb12dac795a0905
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| -rw-r--r-- | qtsingleapplication/src/qtsingleapplication.cpp | 6 | ||||
| -rw-r--r-- | qtsingleapplication/src/qtsingleapplication.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/qtsingleapplication/src/qtsingleapplication.cpp b/qtsingleapplication/src/qtsingleapplication.cpp index b5cfc2a..49b9ad3 100644 --- a/qtsingleapplication/src/qtsingleapplication.cpp +++ b/qtsingleapplication/src/qtsingleapplication.cpp @@ -170,6 +170,7 @@ QtSingleApplication::QtSingleApplication(const QString &appId, int &argc, char * sysInit(appId); } +#if QT_VERSION < 0x050000 /*! Creates a QtSingleApplication object. The application identifier @@ -183,7 +184,7 @@ QtSingleApplication::QtSingleApplication(int &argc, char **argv, Type type) } -#if defined(Q_WS_X11) +# if defined(Q_WS_X11) /*! Special constructor for X11, ref. the documentation of QApplication's corresponding constructor. The application identifier @@ -221,7 +222,8 @@ QtSingleApplication::QtSingleApplication(Display* dpy, const QString &appId, int { sysInit(appId); } -#endif +# endif // Q_WS_X11 +#endif // QT_VERSION < 0x050000 /*! diff --git a/qtsingleapplication/src/qtsingleapplication.h b/qtsingleapplication/src/qtsingleapplication.h index f22a135..4f935ef 100644 --- a/qtsingleapplication/src/qtsingleapplication.h +++ b/qtsingleapplication/src/qtsingleapplication.h @@ -68,12 +68,14 @@ class QT_QTSINGLEAPPLICATION_EXPORT QtSingleApplication : public QApplication public: QtSingleApplication(int &argc, char **argv, bool GUIenabled = true); QtSingleApplication(const QString &id, int &argc, char **argv); +#if QT_VERSION < 0x050000 QtSingleApplication(int &argc, char **argv, Type type); -#if defined(Q_WS_X11) +# if defined(Q_WS_X11) QtSingleApplication(Display* dpy, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); QtSingleApplication(Display *dpy, int &argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE cmap= 0); QtSingleApplication(Display* dpy, const QString &appId, int argc, char **argv, Qt::HANDLE visual = 0, Qt::HANDLE colormap = 0); -#endif +# endif // Q_WS_X11 +#endif // QT_VERSION < 0x050000 bool isRunning(); QString id() const; |