Commit 0afd405d authored by Adriaan de Groot's avatar Adriaan de Groot 💬
Browse files

Merge branch 'reduce-warnings' into 'master'

Reduce warnings

See merge request kde/rocs!6
parents 3e311e73 c9122096
Pipeline #5923 passed with stage
in 7 minutes and 15 seconds
......@@ -82,6 +82,12 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII)
remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
remove_definitions(-DQT_NO_KEYWORDS)
if(KF5Declarative_VERSION VERSION_GREATER_EQUAL "5.45")
add_definitions(-DKDECLARATIVE_HAVE_SETCONTEXT=1)
else()
add_definitions(-DKDECLARATIVE_HAVE_SETCONTEXT=0)
endif()
ecm_optional_add_subdirectory(libgraphtheory)
ecm_optional_add_subdirectory(src)
ecm_optional_add_subdirectory(icons)
......
......@@ -35,7 +35,7 @@
<item row="0" column="1">
<layout class="QHBoxLayout" name="advancedLayout">
<item>
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="property_choice_label">
<property name="text">
<string>Choose Properties</string>
</property>
......@@ -367,7 +367,7 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_2">
<widget class="QLabel" name="constant_label">
<property name="text">
<string>Constant</string>
</property>
......
......@@ -136,6 +136,7 @@ int EdgeModel::rowCount(const QModelIndex &parent) const
void EdgeModel::onEdgeAboutToBeAdded(EdgePtr edge, int index)
{
Q_UNUSED(edge)
//TODO add missing signals
beginInsertRows(QModelIndex(), index, index);
}
......
......@@ -131,6 +131,7 @@ int NodeModel::rowCount(const QModelIndex &parent) const
void NodeModel::onNodeAboutToBeAdded(NodePtr node, int index)
{
Q_UNUSED(node)
//TODO add missing signals
beginInsertRows(QModelIndex(), index, index);
}
......
......@@ -85,7 +85,12 @@ View::View(QWidget *parent)
KDeclarative::KDeclarative kdeclarative;
kdeclarative.setTranslationDomain("libgraphtheory");
kdeclarative.setDeclarativeEngine(engine());
#if KDECLARATIVE_HAVE_SETCONTEXT
kdeclarative.setupContext();
KDeclarative::KDeclarative::setupEngine(engine());
#else
kdeclarative.setupBindings();
#endif
qmlRegisterType<GraphTheory::Node>("org.kde.rocs.graphtheory", 1, 0, "Node");
qmlRegisterType<GraphTheory::Edge>("org.kde.rocs.graphtheory", 1, 0, "Edge");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment