summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/itemviews/frozencolumn/freezetablewidget.cpp2
-rw-r--r--examples/opengl/hellowindow/main.cpp2
-rw-r--r--examples/sql/sqlbrowser/connectionwidget.cpp2
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part1/main.cpp5
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part1/part1.pro2
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part2/main.cpp4
-rw-r--r--examples/tutorials/gettingStarted/gsQt/part2/part2.pro1
-rw-r--r--examples/xml/dombookmarks/xbeltree.cpp2
-rw-r--r--examples/xml/rsslisting/rsslisting.cpp2
-rw-r--r--examples/xml/saxbookmarks/mainwindow.cpp2
-rw-r--r--examples/xml/streambookmarks/mainwindow.cpp2
11 files changed, 14 insertions, 12 deletions
diff --git a/examples/itemviews/frozencolumn/freezetablewidget.cpp b/examples/itemviews/frozencolumn/freezetablewidget.cpp
index 56c3cb174a..ae83c341c4 100644
--- a/examples/itemviews/frozencolumn/freezetablewidget.cpp
+++ b/examples/itemviews/frozencolumn/freezetablewidget.cpp
@@ -76,7 +76,7 @@ void FreezeTableWidget::init()
frozenTableView->setModel(model());
frozenTableView->setFocusPolicy(Qt::NoFocus);
frozenTableView->verticalHeader()->hide();
- frozenTableView->horizontalHeader()->setResizeMode(QHeaderView::Fixed);
+ frozenTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
viewport()->stackUnder(frozenTableView);
//! [init part1]
diff --git a/examples/opengl/hellowindow/main.cpp b/examples/opengl/hellowindow/main.cpp
index 9723e8f9de..e1fde9b5b8 100644
--- a/examples/opengl/hellowindow/main.cpp
+++ b/examples/opengl/hellowindow/main.cpp
@@ -39,7 +39,7 @@
****************************************************************************/
#include <QGuiApplication>
-#include <QPlatformIntegration>
+#include <qpa/qplatformintegration.h>
#include <private/qguiapplication_p.h>
#include <QScreen>
#include <QThread>
diff --git a/examples/sql/sqlbrowser/connectionwidget.cpp b/examples/sql/sqlbrowser/connectionwidget.cpp
index b4d9af6515..208dfb032d 100644
--- a/examples/sql/sqlbrowser/connectionwidget.cpp
+++ b/examples/sql/sqlbrowser/connectionwidget.cpp
@@ -51,7 +51,7 @@ ConnectionWidget::ConnectionWidget(QWidget *parent)
tree = new QTreeWidget(this);
tree->setObjectName(QLatin1String("tree"));
tree->setHeaderLabels(QStringList(tr("database")));
- tree->header()->setResizeMode(QHeaderView::Stretch);
+ tree->header()->setSectionResizeMode(QHeaderView::Stretch);
QAction *refreshAction = new QAction(tr("Refresh"), tree);
metaDataAction = new QAction(tr("Show Schema"), tree);
connect(refreshAction, SIGNAL(triggered()), SLOT(refresh()));
diff --git a/examples/tutorials/gettingStarted/gsQt/part1/main.cpp b/examples/tutorials/gettingStarted/gsQt/part1/main.cpp
index fb45689cc7..6557d0525f 100644
--- a/examples/tutorials/gettingStarted/gsQt/part1/main.cpp
+++ b/examples/tutorials/gettingStarted/gsQt/part1/main.cpp
@@ -40,10 +40,9 @@
#include <QtWidgets>
-
-int main(int argv, char **args)
+int main(int argc, char *argv[])
{
- QApplication app(argv, args);
+ QApplication app(argc, argv);
QTextEdit textEdit;
textEdit.show();
diff --git a/examples/tutorials/gettingStarted/gsQt/part1/part1.pro b/examples/tutorials/gettingStarted/gsQt/part1/part1.pro
index f52a6331b5..b3fd65a1f8 100644
--- a/examples/tutorials/gettingStarted/gsQt/part1/part1.pro
+++ b/examples/tutorials/gettingStarted/gsQt/part1/part1.pro
@@ -1,3 +1,5 @@
+
+QT += widgets
SOURCES = main.cpp
# install
diff --git a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
index 93f14a25bb..996c3149c6 100644
--- a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
+++ b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
@@ -40,9 +40,9 @@
#include <QtWidgets>
-int main(int argv, char **args)
+int main(int argc, char *argv[])
{
- QApplication app(argv, args);
+ QApplication app(argc, argv);
QTextEdit textEdit;
QPushButton quitButton("&Quit");
diff --git a/examples/tutorials/gettingStarted/gsQt/part2/part2.pro b/examples/tutorials/gettingStarted/gsQt/part2/part2.pro
index 383c3ce5ba..81fb0e9ff9 100644
--- a/examples/tutorials/gettingStarted/gsQt/part2/part2.pro
+++ b/examples/tutorials/gettingStarted/gsQt/part2/part2.pro
@@ -1,4 +1,5 @@
+QT += widgets
SOURCES = main.cpp
# install
diff --git a/examples/xml/dombookmarks/xbeltree.cpp b/examples/xml/dombookmarks/xbeltree.cpp
index 196338e2a6..b5091ad784 100644
--- a/examples/xml/dombookmarks/xbeltree.cpp
+++ b/examples/xml/dombookmarks/xbeltree.cpp
@@ -48,7 +48,7 @@ XbelTree::XbelTree(QWidget *parent)
QStringList labels;
labels << tr("Title") << tr("Location");
- header()->setResizeMode(QHeaderView::Stretch);
+ header()->setSectionResizeMode(QHeaderView::Stretch);
setHeaderLabels(labels);
folderIcon.addPixmap(style()->standardPixmap(QStyle::SP_DirClosedIcon),
diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp
index cd6a595764..37b7ad95dd 100644
--- a/examples/xml/rsslisting/rsslisting.cpp
+++ b/examples/xml/rsslisting/rsslisting.cpp
@@ -86,7 +86,7 @@ RSSListing::RSSListing(QWidget *parent)
QStringList headerLabels;
headerLabels << tr("Title") << tr("Link");
treeWidget->setHeaderLabels(headerLabels);
- treeWidget->header()->setResizeMode(QHeaderView::ResizeToContents);
+ treeWidget->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
connect(&manager, SIGNAL(finished(QNetworkReply*)),
this, SLOT(finished(QNetworkReply*)));
diff --git a/examples/xml/saxbookmarks/mainwindow.cpp b/examples/xml/saxbookmarks/mainwindow.cpp
index c68cea0259..a26c71c845 100644
--- a/examples/xml/saxbookmarks/mainwindow.cpp
+++ b/examples/xml/saxbookmarks/mainwindow.cpp
@@ -50,7 +50,7 @@ MainWindow::MainWindow()
labels << tr("Title") << tr("Location");
treeWidget = new QTreeWidget;
- treeWidget->header()->setResizeMode(QHeaderView::Stretch);
+ treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch);
treeWidget->setHeaderLabels(labels);
setCentralWidget(treeWidget);
diff --git a/examples/xml/streambookmarks/mainwindow.cpp b/examples/xml/streambookmarks/mainwindow.cpp
index daf41dec81..65c86f8bd2 100644
--- a/examples/xml/streambookmarks/mainwindow.cpp
+++ b/examples/xml/streambookmarks/mainwindow.cpp
@@ -51,7 +51,7 @@ MainWindow::MainWindow()
labels << tr("Title") << tr("Location");
treeWidget = new QTreeWidget;
- treeWidget->header()->setResizeMode(QHeaderView::Stretch);
+ treeWidget->header()->setSectionResizeMode(QHeaderView::Stretch);
treeWidget->setHeaderLabels(labels);
setCentralWidget(treeWidget);