...
 
Commits (6)
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>611</width>
<height>244</height>
<height>280</height>
</rect>
</property>
<layout class="QFormLayout" name="formLayout">
......@@ -56,7 +56,14 @@
</widget>
</item>
<item row="2" column="1">
<widget class="KUrlRequester" name="buildFolder"/>
<widget class="KUrlRequester" name="buildFolder">
<property name="minimumSize">
<size>
<width>500</width>
<height>0</height>
</size>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
......@@ -79,6 +86,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>500</width>
<height>0</height>
</size>
</property>
<property name="toolTip">
<string>The prefix under which the project will be installed. Leaving this empty will let CMake use its default install prefix.</string>
</property>
......
......@@ -47,6 +47,10 @@ DefinesWidget::DefinesWidget( QWidget* parent )
connect( delDefAction, &QAction::triggered, this, &DefinesWidget::deleteDefine );
}
DefinesWidget::~DefinesWidget()
{
}
void DefinesWidget::setDefines( const Defines& defines )
{
bool b = blockSignals( true );
......
......@@ -40,6 +40,8 @@ class DefinesWidget : public QWidget
Q_OBJECT
public:
explicit DefinesWidget( QWidget* parent = nullptr );
~DefinesWidget() override;
void setDefines( const KDevelop::Defines& defines );
void clear();
Q_SIGNALS:
......@@ -51,7 +53,7 @@ private Q_SLOTS:
// Handle Del key in defines list
void deleteDefine();
private:
Ui::DefinesWidget* ui;
QScopedPointer<Ui::DefinesWidget> ui;
DefinesModel* definesModel;
};
......
......@@ -81,6 +81,10 @@ ProjectPathsWidget::ProjectPathsWidget( QWidget* parent )
tabChanged(IncludesPage);
}
ProjectPathsWidget::~ProjectPathsWidget()
{
}
QVector<ConfigEntry> ProjectPathsWidget::paths() const
{
return pathsModel->paths();
......
......@@ -19,6 +19,7 @@
#ifndef KDEVELOP_PROJECTMANAGERS_CUSTOM_BUILDSYSTEM_PROJECTPATHSWIDGET_H
#define KDEVELOP_PROJECTMANAGERS_CUSTOM_BUILDSYSTEM_PROJECTPATHSWIDGET_H
#include <QScopedPointer>
#include <QWidget>
#include "../compilerprovider/icompiler.h"
......@@ -41,6 +42,8 @@ class ProjectPathsWidget : public QWidget
Q_OBJECT
public:
explicit ProjectPathsWidget( QWidget* parent = nullptr );
~ProjectPathsWidget() override;
void setProject(KDevelop::IProject* w_project);
void setPaths( const QVector<ConfigEntry>& );
QVector<ConfigEntry> paths() const;
......@@ -72,7 +75,7 @@ private Q_SLOTS:
void parserArgumentsChanged();
private:
Ui::ProjectPathsWidget* ui;
QScopedPointer<Ui::ProjectPathsWidget> ui;
ProjectPathsModel* pathsModel;
// Enables/Disables widgets based on UI state/selection
void updateEnablements();
......
......@@ -119,8 +119,8 @@ void ProblemHighlighter::setProblems(const QVector<IProblem::Ptr>& problems)
if (markIface && hadProblems) {
// clear previously added marks
foreach (KTextEditor::Mark* mark, markIface->marks()) {
if (mark->type == errorMarkType || mark->type == warningMarkType) {
markIface->removeMark(mark->line, mark->type);
if (mark->type & (errorMarkType | warningMarkType)) {
markIface->removeMark(mark->line, errorMarkType | warningMarkType);
}
}
}
......