This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 4b86435f3a2e177f7547ec6b25cfe27a800fc867 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Wed Aug 12 14:03:33 2015 +0200 - xsettingswidget: compile only on Windows. --- debian/changelog | 4 ++++ src/xsettingswidget.cpp | 4 ++-- src/xsettingswidget.h | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2ca14b2..fb0049a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,10 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low whitespaces within the var directory path on Windows. Add comment to revisit this later on non-Windows-platforms, too. Fixes: #916. + [ Oleksandr Shneyder ] + * New upstream release (4.0.5.1): + - xsettingswidget: compile only on Windows. + -- X2Go Release Manager <git-admin@x2go.org> Tue, 28 Jul 2015 06:05:27 +0200 x2goclient (4.0.5.0-0x2go1) unstable; urgency=low diff --git a/src/xsettingswidget.cpp b/src/xsettingswidget.cpp index 529d7ac..f8fc732 100644 --- a/src/xsettingswidget.cpp +++ b/src/xsettingswidget.cpp @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ - #include "xsettingswidget.h" #include "x2gosettings.h" #include "x2goutils.h" #include <QFileDialog> +#ifdef Q_OS_WIN XSettingsWidget::XSettingsWidget(QWidget* parent) { UNUSED (parent); @@ -89,4 +89,4 @@ void XSettingsWidget::saveSettings() // st.setting()->setValue("delay",spDelay->value()); st.setting()->sync(); } - +#endif //Q_OS_WIN diff --git a/src/xsettingswidget.h b/src/xsettingswidget.h index b9ed1a5..b79d43f 100644 --- a/src/xsettingswidget.h +++ b/src/xsettingswidget.h @@ -20,6 +20,7 @@ #include <QWidget> +#ifdef Q_OS_WIN #include "ui_xsettingsui.h" class XSettingsWidget : public QWidget, private Ui_XSettingsWidgetUI @@ -33,5 +34,5 @@ public: private slots: void slotSetExecutable(); }; - +#endif //Q_OS_WIN #endif // XSETTINGSWIDGET_H -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git