Skip to content

Commit 415e3b6

Browse files
committed
minor porting
1 parent dc24521 commit 415e3b6

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

modelview/filesystem/filesystem.pro

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
include (../../common.pri)
1+
#include (../../common.pri)
22

3+
QT += widgets
34
TEMPLATE = app
4-
TARGET =
5+
TARGET = filesystem
56
DEPENDPATH += .
67
INCLUDEPATH += .
78

modelview/filesystem/main.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
#include <QtGui>
1+
#include <QtWidgets>
2+
23
int main(int argc, char *argv[]) {
34
QApplication app(argc, argv);
45
QFileSystemModel model;
5-
model.setRootPath("/");
6+
model.setRootPath("/");
67
QTreeView tree;
78
tree.setModel(&model);
89
tree.setSortingEnabled(true); /* Enable HeaderView sort buttons. */
9-
tree.header()->setResizeMode(QHeaderView::ResizeToContents);
10+
tree.header()->setSectionResizeMode(QHeaderView::ResizeToContents);
1011
tree.resize(640, 480);
1112
tree.show();
1213
return app.exec();

modelview/multiview/multiview.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <QtGui>
1+
#include <QtWidgets>
22
//start id=main
33
#include "createModel.h"
44

modelview/multiview/multiview.pro

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
QT += widgets
12
TEMPLATE = app
2-
TARGET =
3+
TARGET = multiview
34
DEPENDPATH += .
45
INCLUDEPATH += .
56

properties/customer-props.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void Customer::setType(QString newType) { /* Overloaded version
6969

7070
QMetaEnum menum = mp.enumerator(); /* This code gets
7171
executed each time. */
72-
const char* ntyp = newType.toAscii().data();
72+
const char* ntyp = newType.toLatin1().data();
7373
CustomerType theType =
7474
static_cast<CustomerType>(menum.keyToValue(ntyp));
7575

properties/properties.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include (../common.pri)
22

3-
CONFIG += qtestlib
3+
QT += testlib
44

55
TEMPLATE = app
66
INCLUDEPATH += .

0 commit comments

Comments
 (0)