mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-24 13:25:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

Utility: Compile on Windows again

Browse source 
Theme moc files belong with libowncloud
This commit is contained in:
Daniel Molkentin 2013-07-06 22:39:06 +02:00
parent fff795146e
commit 751d7deda6
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/CMakeLists.txt
View file

@ -81,6 +81,8 @@ set(libsync_HEADERS
mirall/folderwatcher.h mirall/folderwatcher.h
mirall/owncloudfolder.h mirall/owncloudfolder.h
mirall/csyncthread.h mirall/csyncthread.h
mirall/theme.h
mirall/owncloudtheme.h
mirall/owncloudinfo.h mirall/owncloudinfo.h
mirall/credentialstore.h mirall/credentialstore.h
mirall/logger.h mirall/logger.h
@ -175,7 +177,6 @@ set(mirall_HEADERS
mirall/generalsettings.h mirall/generalsettings.h
mirall/accountsettings.h mirall/accountsettings.h
mirall/ignorelisteditor.h mirall/ignorelisteditor.h
mirall/theme.h
) )
if( UNIX AND NOT APPLE) if( UNIX AND NOT APPLE)

1
src/mirall/owncloudtheme.h
View file

@ -21,6 +21,7 @@ namespace Mirall {
class ownCloudTheme : public Theme class ownCloudTheme : public Theme
{ {
Q_OBJECT
public: public:
ownCloudTheme(); ownCloudTheme();

5
src/mirall/utility.cpp
View file

@ -164,7 +164,7 @@ static const char runPathC[] = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\
bool Utility::hasLaunchOnStartup(const QString &appName) bool Utility::hasLaunchOnStartup(const QString &appName)
{ {
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
QString runPath(QLatin1String(runPathC)); QString runPath = QLatin1String(runPathC);
QSettings settings(runPath, QSettings::NativeFormat); QSettings settings(runPath, QSettings::NativeFormat);
return settings.contains(appName); return settings.contains(appName);
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
@ -182,7 +182,8 @@ namespace {
void Utility::setLaunchOnStartup(const QString &appName, const QString& guiName, bool enable) void Utility::setLaunchOnStartup(const QString &appName, const QString& guiName, bool enable)
{ {
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
QString runPath(QLatin1String(runPathC)); Q_UNUSED(guiName)
QString runPath = QLatin1String(runPathC);
QSettings settings(runPath, QSettings::NativeFormat); QSettings settings(runPath, QSettings::NativeFormat);
if (enable) { if (enable) {
settings.setValue(appName, QCoreApplication::applicationFilePath().replace('/','\\')); settings.setValue(appName, QCoreApplication::applicationFilePath().replace('/','\\'));