summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2015-01-30 22:08:50 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-01-30 22:08:50 -0800
commitcb6bda4e0cb38380b31a8952f323e26d2d3f2d9e (patch)
treea851d5834c3d57639709f0b1d05542a15ea78e1c
parentd8e5e1922fcfff99282b296676fc2da102025bec (diff)
downloadsubsurface-cb6bda4e0cb38380b31a8952f323e26d2d3f2d9e.tar.gz
Compile Facebook support when building with Qt5
Now that Facebook approved our use of the API, we can build this by default. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--qt-ui/preferences.cpp2
-rw-r--r--subsurface.pro2
2 files changed, 2 insertions, 2 deletions
diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp
index 92c46f75b..632251d18 100644
--- a/qt-ui/preferences.cpp
+++ b/qt-ui/preferences.cpp
@@ -48,7 +48,7 @@ PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WindowFlags f) : QDial
ui.proxyType->setCurrentIndex(-1);
// Facebook stuff:
-#if !defined(Q_OS_ANDROID) && defined(FBSUPPRORT)
+#if !defined(Q_OS_ANDROID) && defined(FBSUPPORT)
FacebookManager *fb = FacebookManager::instance();
if(fb->loggedIn()){
facebookWebView->setHtml("You are connected on Facebook, yey.");
diff --git a/subsurface.pro b/subsurface.pro
index 71fef0fd0..6392e53db 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -240,7 +240,7 @@ FORMS = \
# Nether usermanual or printing is supported on android right now
android: FORMS -= qt-ui/printoptions.ui
-FBSUPPORT: {
+greaterThan(QT_MAJOR_VERSION, 4) {
FORMS += qt-ui/socialnetworksdialog.ui
SOURCES += qt-ui/socialnetworks.cpp
HEADERS += qt-ui/socialnetworks.h