[Pkg-owncloud-commits] [owncloud-client] 192/332: Fix windows compilation
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Aug 14 21:06:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit d1b991e1984ef0c4ed803c5c5ead1ce3bfe00266
Author: Daniel Molkentin <danimo at owncloud.com>
Date: Thu Jul 10 22:58:58 2014 +0200
Fix windows compilation
---
src/CMakeLists.txt | 2 +-
src/mirall/filesystem.h | 4 +++-
src/mirall/folder.h | 2 +-
src/mirall/networkjobs.h | 2 +-
src/mirall/syncfilestatus.h | 4 +++-
src/mirall/utility.h | 2 +-
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 52e3aac..ec15a25 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -85,7 +85,6 @@ set(libsync_SRCS
mirall/account.cpp
mirall/quotainfo.cpp
mirall/clientproxy.cpp
- mirall/syncrunfilelog.cpp
mirall/cookiejar.cpp
mirall/syncfilestatus.cpp
creds/dummycredentials.cpp
@@ -267,6 +266,7 @@ set(mirall_SRCS
mirall/owncloudgui.cpp
mirall/socketapi.cpp
mirall/sslbutton.cpp
+ mirall/syncrunfilelog.cpp
)
diff --git a/src/mirall/filesystem.h b/src/mirall/filesystem.h
index f4a1671..c8e10ce 100644
--- a/src/mirall/filesystem.h
+++ b/src/mirall/filesystem.h
@@ -16,6 +16,8 @@
#include <QString>
#include <ctime>
+#include <owncloudlib.h>
+
namespace Mirall {
/**
@@ -28,7 +30,7 @@ namespace FileSystem {
bool fileEquals(const QString &fn1, const QString &fn2);
/** Mark the file as hidden (only has effects on windows) */
-void setFileHidden(const QString& filename, bool hidden);
+void OWNCLOUDSYNC_EXPORT setFileHidden(const QString& filename, bool hidden);
void setModTime(const QString &filename, time_t modTime);
diff --git a/src/mirall/folder.h b/src/mirall/folder.h
index 3eb319a..8a9d554 100644
--- a/src/mirall/folder.h
+++ b/src/mirall/folder.h
@@ -43,7 +43,7 @@ class SyncEngine;
class FolderWatcher;
-class OWNCLOUDSYNC_EXPORT Folder : public QObject
+class Folder : public QObject
{
Q_OBJECT
diff --git a/src/mirall/networkjobs.h b/src/mirall/networkjobs.h
index a15ed92..5b8c196 100644
--- a/src/mirall/networkjobs.h
+++ b/src/mirall/networkjobs.h
@@ -208,7 +208,7 @@ private:
/**
* @brief The RequestEtagJob class
*/
-class RequestEtagJob : public AbstractNetworkJob {
+class OWNCLOUDSYNC_EXPORT RequestEtagJob : public AbstractNetworkJob {
Q_OBJECT
public:
explicit RequestEtagJob(Account *account, const QString &path, QObject *parent = 0);
diff --git a/src/mirall/syncfilestatus.h b/src/mirall/syncfilestatus.h
index 2c3e6ea..9e656f5 100644
--- a/src/mirall/syncfilestatus.h
+++ b/src/mirall/syncfilestatus.h
@@ -16,9 +16,11 @@
#include <QString>
+#include "owncloudlib.h"
+
namespace Mirall {
-class SyncFileStatus
+class OWNCLOUDSYNC_EXPORT SyncFileStatus
{
public:
enum SyncFileStatusTag {
diff --git a/src/mirall/utility.h b/src/mirall/utility.h
index 4c98e7e..0d46146 100644
--- a/src/mirall/utility.h
+++ b/src/mirall/utility.h
@@ -82,7 +82,7 @@ namespace Utility
// if false, the two cases are two different files.
OWNCLOUDSYNC_EXPORT bool fsCasePreserving();
- class StopWatch {
+ class OWNCLOUDSYNC_EXPORT StopWatch {
private:
QHash<QString, quint64> _lapTimes;
QDateTime _startTime;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list