Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'desktopConfig' into 'master'
Add "desktop" configuration option

See merge request !9
  • Loading branch information
rainemak committed Jan 12, 2018
2 parents 1060a53 + 9a2d410 commit 492d8b0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/plugin/filemodel.cpp
Expand Up @@ -492,7 +492,11 @@ void FileModel::refreshEntries()

// read all files
QVector<StatFileInfo> newFiles = directoryEntries(dir);
#ifdef DESKTOP
m_files = newFiles;
#else
::synchronizeList(this, m_files, newFiles);
#endif
}

recountSelectedFiles();
Expand Down
2 changes: 2 additions & 0 deletions src/plugin/filemodel.h
Expand Up @@ -35,7 +35,9 @@

#include "statfileinfo.h"

#ifndef DESKTOP
#include <synchronizelists.h>
#endif

#include <QAbstractListModel>
#include <QBasicTimer>
Expand Down
7 changes: 6 additions & 1 deletion src/plugin/plugin.pro
Expand Up @@ -6,7 +6,12 @@ CONFIG += qt plugin hide_symbols c++11
QT += qml dbus

CONFIG += link_pkgconfig
PKGCONFIG += contactcache-qt5

contains(CONFIG, desktop) {
DEFINES *= DESKTOP
} else {
PKGCONFIG += contactcache-qt5
}

# Drop any library linkage we dont actually need (such as contactcache-qt5)
QMAKE_LFLAGS *= -Wl,--as-needed
Expand Down

0 comments on commit 492d8b0

Please sign in to comment.