Revert "Support Qt in namespace (#69)"

The commit broke the build for non namespaced Qt
This reverts commit f8393999b6.

closes #70
This commit is contained in:
Pierre-Yves Siret 2020-01-07 00:21:11 +01:00
parent f8393999b6
commit 1e98ca7776
7 changed files with 3 additions and 13 deletions

View File

@ -42,10 +42,6 @@ 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>

View File

@ -4,7 +4,7 @@
#include "filter.h"
#include <QQmlScriptString>
class QT_PREPEND_NAMESPACE(QQmlExpression);
class QQmlExpression;
namespace qqsfpm {

View File

@ -36,9 +36,7 @@ private:
}
QT_BEGIN_NAMESPACE
#define FilterContainer_iid "fr.grecko.SortFilterProxyModel.FilterContainer"
Q_DECLARE_INTERFACE(qqsfpm::FilterContainer, FilterContainer_iid)
QT_END_NAMESPACE
#endif // FILTERCONTAINER_H

View File

@ -4,7 +4,7 @@
#include "singlerole.h"
#include <QQmlScriptString>
class QT_PREPEND_NAMESPACE(QQmlExpression);
class QQmlExpression;
namespace qqsfpm {

View File

@ -36,9 +36,7 @@ private:
}
QT_BEGIN_NAMESPACE
#define ProxyRoleContainer_iid "fr.grecko.SortFilterProxyModel.ProxyRoleContainer"
Q_DECLARE_INTERFACE(qqsfpm::ProxyRoleContainer, ProxyRoleContainer_iid)
QT_END_NAMESPACE
#endif // PROXYROLECONTAINER_H

View File

@ -4,7 +4,7 @@
#include "sorter.h"
#include <QQmlScriptString>
class QT_PREPEND_NAMESPACE(QQmlExpression);
class QQmlExpression;
namespace qqsfpm {

View File

@ -36,9 +36,7 @@ private:
}
QT_BEGIN_NAMESPACE
#define SorterContainer_iid "fr.grecko.SortFilterProxyModel.SorterContainer"
Q_DECLARE_INTERFACE(qqsfpm::SorterContainer, SorterContainer_iid)
QT_END_NAMESPACE
#endif // SORTERSSORTERCONTAINER_H