From dd855f021d11dd3267215c4e835e511b6927b90f Mon Sep 17 00:00:00 2001 From: Flavio Tordini Date: Sun, 21 Sep 2014 18:45:27 +0200 Subject: [PATCH] Qt5 fix --- src/qtsingleapplication/qtsingleapplication.cpp | 2 +- src/qtsingleapplication/qtsingleapplication.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qtsingleapplication/qtsingleapplication.cpp b/src/qtsingleapplication/qtsingleapplication.cpp index 3840ad8..ec40040 100644 --- a/src/qtsingleapplication/qtsingleapplication.cpp +++ b/src/qtsingleapplication/qtsingleapplication.cpp @@ -191,7 +191,7 @@ QtSingleApplication::QtSingleApplication(int &argc, char **argv, Type type) */ -#if defined(Q_OS_LINUX) +#if defined(Q_OS_LINUX_NO) /*! Special constructor for X11, ref. the documentation of QApplication's corresponding constructor. The application identifier diff --git a/src/qtsingleapplication/qtsingleapplication.h b/src/qtsingleapplication/qtsingleapplication.h index 29a4182..09afcc9 100644 --- a/src/qtsingleapplication/qtsingleapplication.h +++ b/src/qtsingleapplication/qtsingleapplication.h @@ -73,7 +73,7 @@ public: QtSingleApplication(int &argc, char **argv, bool GUIenabled = true); QtSingleApplication(const QString &id, int &argc, char **argv); // QtSingleApplication(int &argc, char **argv, Type type); -#if defined(Q_OS_LINUX) +#if defined(Q_OS_LINUX_NO) 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); -- 2.39.5