[qet] [3802] Fix compil in Qt5 |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/qet Archives
]
Revision: 3802
Author: scorpio810
Date: 2015-03-04 21:21:21 +0100 (Wed, 04 Mar 2015)
Log Message:
-----------
Fix compil in Qt5
Modified Paths:
--------------
branches/dxftoelmt/ImportDXF.pro
branches/dxftoelmt/src/ui/dxf_elmt_output.cpp
branches/dxftoelmt/src/ui/dxftoelmt.h
Modified: branches/dxftoelmt/ImportDXF.pro
===================================================================
--- branches/dxftoelmt/ImportDXF.pro 2015-03-04 14:36:07 UTC (rev 3801)
+++ branches/dxftoelmt/ImportDXF.pro 2015-03-04 20:21:21 UTC (rev 3802)
@@ -14,7 +14,7 @@
INCLUDEPATH += src \
src/ui
-CONFIG += uitools
+QT += xml widgets
SOURCES += src/main.cpp \
src/ui/dxf_ltype.cpp \
Modified: branches/dxftoelmt/src/ui/dxf_elmt_output.cpp
===================================================================
--- branches/dxftoelmt/src/ui/dxf_elmt_output.cpp 2015-03-04 14:36:07 UTC (rev 3801)
+++ branches/dxftoelmt/src/ui/dxf_elmt_output.cpp 2015-03-04 20:21:21 UTC (rev 3802)
@@ -436,7 +436,7 @@
Lineout2.append(QChar(34));
Lineout2.append(" uuid=");
Lineout2.append(QChar(34));
- Lineout2.append(QUuid::createUuid());
+// Lineout2.append(QUuid::createUuid());
Lineout2.append(QChar(34));
Lineout2.append(" orientation=");
Lineout2.append(QChar(34));
@@ -506,7 +506,7 @@
Lineout3.append(QChar(34));
Lineout3.append(" uuid=");
Lineout3.append(QChar(34));
- Lineout3.append(QUuid::createUuid());
+// Lineout3.append(QUuid::createUuid());
Lineout3.append(QChar(34));
Lineout3.append(" orientation=");
Lineout3.append(QChar(34));
Modified: branches/dxftoelmt/src/ui/dxftoelmt.h
===================================================================
--- branches/dxftoelmt/src/ui/dxftoelmt.h 2015-03-04 14:36:07 UTC (rev 3801)
+++ branches/dxftoelmt/src/ui/dxftoelmt.h 2015-03-04 20:21:21 UTC (rev 3802)
@@ -3,7 +3,7 @@
#include <QtCore>
#include <QFileDialog>
-#include <QtUiTools>
+#include <QtGui>
#include <QStatusBar>
#include "QTextStream"
#include <QMessageBox>