diff --git a/core/glshaders.cpp b/core/glshaders.cpp
index 4fff0d2..1ce1092 100644
--- a/core/glshaders.cpp
+++ b/core/glshaders.cpp
@@ -74,7 +74,7 @@ bool QGLEngineShaders::loadShadersMulti(QOpenGLShaderProgram *& prog, const QStr
 	}
 	QTextStream ts(&f);
 	QString cur_shader, line, pl, defs = prepareDefines(defines);
-	QOpenGLShader::ShaderType type = 0;
+	QOpenGLShader::ShaderType type = QOpenGLShader::ShaderType();
 	while (!ts.atEnd()) {
 		line = ts.readLine();
 		pl = line.trimmed().remove(' ').remove('\t').mid(2).toLower();
@@ -124,7 +124,7 @@ bool QGLEngineShaders::loadShaders(QOpenGLShaderProgram *& prog, const QStringLi
 	QString cur_shader, defs = prepareDefines(defines);
 	foreach (QString f, files) {
 		QFileInfo fi(f);
-		QOpenGLShader::ShaderType type = 0;
+		QOpenGLShader::ShaderType type = QOpenGLShader::ShaderType();
 		if (fi.suffix().toLower() == "vert") type = QOpenGLShader::Vertex  ;
 		if (fi.suffix().toLower() == "frag") type = QOpenGLShader::Fragment;
 		if (fi.suffix().toLower() == "geom") type = QOpenGLShader::Geometry;
diff --git a/qglview.h b/qglview.h
index 66a64a5..42bd3c9 100644
--- a/qglview.h
+++ b/qglview.h
@@ -27,7 +27,7 @@
 #include "glscene.h"
 #include "renderer.h"
 #include "mouse_controller.h"
-#include <QTime>
+#include <QElapsedTimer>
 #include <QMenu>
 
 
@@ -220,7 +220,7 @@ private:
 	QMenu context_menu;
 	QSet<int> keys_;
 	QColor backColor_, fogColor_, ambientColor_, hoverHaloColor_, selectionHaloColor_;
-	QTime time, ktm_;
+	QElapsedTimer time, ktm_;
 	GLint max_anisotropic, max_texture_chanels;
 	ObjectBase::RenderMode rmode;
 	GLRendererBase::RenderingParameters start_rp;
diff --git a/renderer_service.cpp b/renderer_service.cpp
index e71a183..a039a13 100644
--- a/renderer_service.cpp
+++ b/renderer_service.cpp
@@ -30,7 +30,7 @@ using namespace QGLEngineShaders;
 RendererService::RendererService(Renderer * r_): r(r_) {
 	line_width = 1;
 	current_action = haNoAction;
-	current_handle = 0;
+	current_handle = QFlags<HandleMesh>();
 	mat_xyz.resize(3);   mat_ms2.resize(3);
 	color_xyz.resize(3); color_ms2.resize(3);
 	const QVector3D _rot [3] = {QVector3D(0,1,0), QVector3D(-1,0,0), QVector3D(0, 0,1)};
diff --git a/tonemapping_proc.h b/tonemapping_proc.h
index b6f99d5..129d079 100644
--- a/tonemapping_proc.h
+++ b/tonemapping_proc.h
@@ -40,7 +40,7 @@ public:
 	float frameMax();
 
 protected:
-	void timerEvent(QTimerEvent * e);
+	void timerEvent(QTimerEvent * e) override;
 	void run() override;
 	float calcHistogram(const QVector<QVector4D> & data);
 
diff --git a/widgets/propertyeditor.cpp b/widgets/propertyeditor.cpp
index b4c568e..1feafae 100644
--- a/widgets/propertyeditor.cpp
+++ b/widgets/propertyeditor.cpp
@@ -249,11 +249,11 @@ void Delegate::changedFlag() {
 	int row = 0;
 	qulonglong val = 0;
 	QList<QModelIndex> chldr;
-	mi = p.child(row, 1);
+	mi = model->index(row, 1, p);
 	while (mi.isValid()) {
 		chldr << mi;
 		model->setData(mi, !mi.data(Qt::UserRole + 4).toBool(), Qt::UserRole + 4);
-		mi = p.child(++row, 1);
+		mi = model->index(++row, 1, p);
 	}
 	bool cc = cmi.data(Qt::UserRole + 3).toBool();
 	qulonglong cv = cmi.data(Qt::UserRole).toULongLong();
@@ -377,7 +377,7 @@ void PropertyEditor::rebuild() {
 		setItemBackColor(tli, Qt::darkGray);
 		setItemForeColor(tli, Qt::white);
 		addTopLevelItem(tli);
-		setFirstItemColumnSpanned(tli, true);
+		tli->setFirstColumnSpanned(true);
 		tli->setExpanded(true);
 		for (int i = ps; i < pe; ++i) {
 			props << o->property(i);
diff --git a/widgets/propertyeditor.h b/widgets/propertyeditor.h
index 143e32c..a494ef5 100644
--- a/widgets/propertyeditor.h
+++ b/widgets/propertyeditor.h
@@ -76,7 +76,7 @@ protected:
 
 private:
 	void configTree();
-	void setItemBackColor(QTreeWidgetItem * i, const QColor & c) {i->setBackgroundColor(0, c); i->setBackgroundColor(1, c);}
+	void setItemBackColor(QTreeWidgetItem * i, const QColor & c) {i->setBackground(0, c); i->setBackground(1, c);}
 	void setItemForeColor(QTreeWidgetItem * i, const QColor & c) {i->setForeground(0, c); i->setForeground(1, c);}
 	void rebuild();
 	void refresh();