Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix broken compilation under MacOS #3

Merged
merged 1 commit into from
Feb 28, 2022
Merged

Fix broken compilation under MacOS #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion extern/QtFlowLayout
Open in desktop
Submodule QtFlowLayout updated 4 files
+11 −9 README.md
+23 −5 src/flowlayout.cpp
+7 −1 src/flowlayout.hpp
+7 −3 test/mainwindow.cpp
4 changes: 2 additions & 2 deletions src/picdialog.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
*
* ============================================================ */

#include <flowlayout.h>
#include "flowlayout.h"
#include <QDialog>
#include <QThreadPool>

#include <digikam/previewloadthread.h>
#include "previewloadthread.h"

using namespace Digikam;

Expand Down
10 changes: 5 additions & 5 deletions src/plugflow.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

#pragma once

#include <digikam/dplugingeneric.h>
#include <flowlayout.h>
#include "dplugingeneric.h"
#include "flowlayout.h"

#define DPLUGIN_IID "org.kde.digikam.plugin.generic.FlowView"

Expand All @@ -27,9 +27,9 @@ namespace Cathaysia {
class PlugSettings;

class FlowPlugin : public DPluginGeneric {
Q_OBJECT;
Q_PLUGIN_METADATA(IID DPLUGIN_IID);
Q_INTERFACES(Digikam::DPluginGeneric);
Q_OBJECT
Q_PLUGIN_METADATA(IID DPLUGIN_IID)
Q_INTERFACES(Digikam::DPluginGeneric)

public:
explicit FlowPlugin(QObject* const parent = nullptr);
Expand Down
4 changes: 2 additions & 2 deletions src/plugsettings.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* ============================================================ */
#pragma once

#include <digikam/dplugindialog.h>
#include <flowlayout.h>
#include "dplugindialog.h"
#include "flowlayout.h"

class QComboBox;
class QSpinBox;
Expand Down