Skip to content

Support Qt in namespace (#69) #72

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support Qt in namespace (#69) #72

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ add_library(SortFilterProxyModel OBJECT
proxyroles/filterrole.cpp
)

target_compile_definitions(SortFilterProxyModel PUBLIC
$<TARGET_PROPERTY:Qt5::Core,INTERFACE_COMPILE_DEFINITIONS>
)

target_include_directories(SortFilterProxyModel PUBLIC
${CMAKE_CURRENT_LIST_DIR}
$<TARGET_PROPERTY:Qt5::Core,INTERFACE_INCLUDE_DIRECTORIES>
Expand Down
2 changes: 1 addition & 1 deletion filters/expressionfilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "filter.h"
#include <QQmlScriptString>

class QQmlExpression;
QT_FORWARD_DECLARE_CLASS(QQmlExpression);

namespace qqsfpm {

Expand Down
2 changes: 2 additions & 0 deletions filters/filtercontainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ class FilterContainer {

}

QT_BEGIN_NAMESPACE
#define FilterContainer_iid "fr.grecko.SortFilterProxyModel.FilterContainer"
Q_DECLARE_INTERFACE(qqsfpm::FilterContainer, FilterContainer_iid)
QT_END_NAMESPACE

#endif // FILTERCONTAINER_H
2 changes: 1 addition & 1 deletion proxyroles/expressionrole.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "singlerole.h"
#include <QQmlScriptString>

class QQmlExpression;
QT_FORWARD_DECLARE_CLASS(QQmlExpression);

namespace qqsfpm {

Expand Down
2 changes: 2 additions & 0 deletions proxyroles/proxyrolecontainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ class ProxyRoleContainer {

}

QT_BEGIN_NAMESPACE
#define ProxyRoleContainer_iid "fr.grecko.SortFilterProxyModel.ProxyRoleContainer"
Q_DECLARE_INTERFACE(qqsfpm::ProxyRoleContainer, ProxyRoleContainer_iid)
QT_END_NAMESPACE

#endif // PROXYROLECONTAINER_H
2 changes: 1 addition & 1 deletion sorters/expressionsorter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "sorter.h"
#include <QQmlScriptString>

class QQmlExpression;
QT_FORWARD_DECLARE_CLASS(QQmlExpression);

namespace qqsfpm {

Expand Down
2 changes: 2 additions & 0 deletions sorters/sortercontainer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ class SorterContainer {

}

QT_BEGIN_NAMESPACE
#define SorterContainer_iid "fr.grecko.SortFilterProxyModel.SorterContainer"
Q_DECLARE_INTERFACE(qqsfpm::SorterContainer, SorterContainer_iid)
QT_END_NAMESPACE

#endif // SORTERSSORTERCONTAINER_H