aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Mi <codeminister@publicstatic.de>2014-01-19 16:48:05 (GMT)
committerGregor Mi <codeminister@publicstatic.de>2014-01-19 16:48:05 (GMT)
commit14a01a01c3ef90f46df25be3aaac70456670b32b (patch)
tree84ab36640c230e53d5a84f173d6c30414598f75a
parent5b8884e016786bcef2ae6430ca612ed2290f1307 (diff)
port to frameworks: step 2: compiles and links
-rw-r--r--CMakeLists.txt1
-rw-r--r--libksane/CMakeLists.txt2
-rw-r--r--libksane/ksane_find_devices_thread.h2
-rw-r--r--libksane/ksane_widget.cpp4
-rw-r--r--libksane/ksane_widget.h (renamed from libksane/ksane.h)2
-rw-r--r--libksane/ksane_widget_private.h4
6 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a75c991..0e7b4f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ find_package(KF5I18n ${KF5_VERSION} REQUIRED)
find_package(KF5PrintUtils ${KF5_VERSION} REQUIRED)
find_package(KF5XmlGui ${KF5_VERSION} REQUIRED)
#find_package(KF5Notifications ${KF5_VERSION} REQUIRED)
+find_package(KF5Wallet ${KF5_VERSION} REQUIRED)
find_package(KF5KDE4Support ${KF5_VERSION} REQUIRED)
# Check if sane API is available.
diff --git a/libksane/CMakeLists.txt b/libksane/CMakeLists.txt
index f705857..fefe563 100644
--- a/libksane/CMakeLists.txt
+++ b/libksane/CMakeLists.txt
@@ -35,12 +35,12 @@ set(ksane_LIB_SRCS
add_library(ksane SHARED ${ksane_LIB_SRCS})
-# TODO KDE4_KDEUI_LIBS
target_link_libraries (ksane
LINK_PRIVATE
KF5::I18n
KF5::PrintUtils
KF5::KDE4Support
+ KF5::Wallet
${SANE_LIBRARY})
set_target_properties(ksane PROPERTIES VERSION ${KSANE_LIB_SO_VERSION_STRING} SOVERSION ${KSANE_LIB_SO_CUR_VERSION})
diff --git a/libksane/ksane_find_devices_thread.h b/libksane/ksane_find_devices_thread.h
index 8207970..b610d0f 100644
--- a/libksane/ksane_find_devices_thread.h
+++ b/libksane/ksane_find_devices_thread.h
@@ -28,7 +28,7 @@
#ifndef KSANE_FIND_DEVICES_THREAD_H
#define KSANE_FIND_DEVICES_THREAD_H
-#include "ksane.h"
+#include "ksane_widget.h"
#include <QThread>
#include <QList>
diff --git a/libksane/ksane_widget.cpp b/libksane/ksane_widget.cpp
index ae11e41..bb05b44 100644
--- a/libksane/ksane_widget.cpp
+++ b/libksane/ksane_widget.cpp
@@ -28,7 +28,7 @@
*
* ============================================================ */
-#include "ksane.h"
+#include "ksane_widget.h"
#include <unistd.h>
@@ -101,7 +101,7 @@ KSaneWidget::KSaneWidget(QWidget* parent)
d->m_findDevThread->start();
d->m_readValsTmr.setSingleShot(true);
- connect(&d->m_readValsTmr, SIGNAL(timeout()), d, SLOT(valReload()));
+ connect(&d->m_readValsTmr, SIGNAL(timeout()), d, SLOT(valReload()));
d->m_updProgressTmr.setSingleShot(false);
d->m_updProgressTmr.setInterval(300);
diff --git a/libksane/ksane.h b/libksane/ksane_widget.h
index 578172f..a8ab81d 100644
--- a/libksane/ksane.h
+++ b/libksane/ksane_widget.h
@@ -30,7 +30,7 @@
#define KSANE_H
// Qt includes
-#include <QtGui/QWidget>
+#include <QWidget>
// Local includes
#include "libksane_export.h"
diff --git a/libksane/ksane_widget_private.h b/libksane/ksane_widget_private.h
index 8adf06f..edc98e1 100644
--- a/libksane/ksane_widget_private.h
+++ b/libksane/ksane_widget_private.h
@@ -36,7 +36,7 @@ extern "C"
}
// Qt includes
-#include <QtGui/QWidget>
+#include <QWidget>
#include <QCheckBox>
#include <QTimer>
#include <QTime>
@@ -51,7 +51,7 @@ extern "C"
#include <KToolBar>
// Local includes
-#include "ksane.h"
+#include "ksane_widget.h"
#include "ksane_option.h"
#include "ksane_viewer.h"
#include "labeled_gamma.h"