diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:37:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:58:32 +0200 |
| commit | 01bc69f99f189b03d0b9cad77cc300798937cad1 (patch) | |
| tree | 730f3b691cfc1830ec617b3c2ad8df16180de724 /examples/sql/tablemodel/tablemodel.cpp | |
| parent | c23c4a921d0e9e2d18a62af82d38ca27eac7bcb3 (diff) | |
| parent | 6d699d08200b1fe3a616dfbc275d46c98b77fcbd (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/styles/mac/qmacstyle_mac.mm
src/widgets/util/qcompleter.cpp
src/widgets/widgets/qmainwindowlayout.cpp
src/widgets/widgets/qmdisubwindow.cpp
Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973
Diffstat (limited to 'examples/sql/tablemodel/tablemodel.cpp')
| -rw-r--r-- | examples/sql/tablemodel/tablemodel.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/examples/sql/tablemodel/tablemodel.cpp b/examples/sql/tablemodel/tablemodel.cpp index c22e25cbeff..a6e0341c237 100644 --- a/examples/sql/tablemodel/tablemodel.cpp +++ b/examples/sql/tablemodel/tablemodel.cpp @@ -47,11 +47,13 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ +#include "../connection.h" -#include <QtWidgets> -#include <QtSql> +#include <QApplication> +#include <QSqlTableModel> +#include <QTableView> -#include "../connection.h" +#include <stdlib.h> void initializeModel(QSqlTableModel *model) { @@ -76,7 +78,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); if (!createConnection()) - return 1; + return EXIT_FAILURE; QSqlTableModel model; |