summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-09-13 09:33:49 +0200
committerGunnar Sletta <gunnar.sletta@nokia.com>2011-09-13 09:34:07 +0200
commite15d4c73762ca8b21acebe581c520bcd06a8d867 (patch)
treeecf4903db11f3e8a58dadada2ceb38c869f761e3 /examples
parent7137785c87497f8beb5bda20505466430c6b1521 (diff)
parent024b56232908af2083720c96a40666c325336141 (diff)
downloadqtxmlpatterns-e15d4c73762ca8b21acebe581c520bcd06a8d867.tar.gz
Merge branch 'refactor'
Conflicts: src/xmlpatterns/xmlpatterns.pro Change-Id: I8d435220281ec372f23c98ab3c15c9a208bacad8
Diffstat (limited to 'examples')
-rw-r--r--examples/xmlpatterns/filetree/filetree.pro2
-rw-r--r--examples/xmlpatterns/filetree/main.cpp2
-rw-r--r--examples/xmlpatterns/filetree/mainwindow.cpp3
-rw-r--r--examples/xmlpatterns/recipes/querymainwindow.cpp3
-rw-r--r--examples/xmlpatterns/recipes/recipes.pro2
-rw-r--r--examples/xmlpatterns/schema/schema.pro2
-rw-r--r--examples/xmlpatterns/trafficinfo/main.cpp2
-rw-r--r--examples/xmlpatterns/trafficinfo/mainwindow.cpp4
-rw-r--r--examples/xmlpatterns/trafficinfo/mainwindow.h2
-rw-r--r--examples/xmlpatterns/trafficinfo/stationdialog.h2
-rw-r--r--examples/xmlpatterns/trafficinfo/trafficinfo.pro2
11 files changed, 14 insertions, 12 deletions
diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro
index fc1c11b..4b3430a 100644
--- a/examples/xmlpatterns/filetree/filetree.pro
+++ b/examples/xmlpatterns/filetree/filetree.pro
@@ -1,7 +1,7 @@
SOURCES += main.cpp filetree.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
HEADERS += filetree.h mainwindow.h ../shared/xmlsyntaxhighlighter.h
FORMS += forms/mainwindow.ui
-QT += xmlpatterns
+QT += widgets xmlpatterns
RESOURCES += queries.qrc
INCLUDEPATH += ../shared/
diff --git a/examples/xmlpatterns/filetree/main.cpp b/examples/xmlpatterns/filetree/main.cpp
index 939072a..339b62a 100644
--- a/examples/xmlpatterns/filetree/main.cpp
+++ b/examples/xmlpatterns/filetree/main.cpp
@@ -38,7 +38,7 @@
**
****************************************************************************/
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
#include "mainwindow.h"
diff --git a/examples/xmlpatterns/filetree/mainwindow.cpp b/examples/xmlpatterns/filetree/mainwindow.cpp
index 43502ce..96cb793 100644
--- a/examples/xmlpatterns/filetree/mainwindow.cpp
+++ b/examples/xmlpatterns/filetree/mainwindow.cpp
@@ -38,7 +38,8 @@
**
****************************************************************************/
-#include <QtGui>
+#include <QFileDialog>
+#include <QMessageBox>
#include <QLibraryInfo>
#include <QtXmlPatterns>
diff --git a/examples/xmlpatterns/recipes/querymainwindow.cpp b/examples/xmlpatterns/recipes/querymainwindow.cpp
index 95a8669..2393306 100644
--- a/examples/xmlpatterns/recipes/querymainwindow.cpp
+++ b/examples/xmlpatterns/recipes/querymainwindow.cpp
@@ -38,7 +38,8 @@
**
****************************************************************************/
-#include <QtGui>
+#include <QMessageBox>
+#include <QFileDialog>
#include <QtXmlPatterns>
#include "querymainwindow.h"
diff --git a/examples/xmlpatterns/recipes/recipes.pro b/examples/xmlpatterns/recipes/recipes.pro
index 9e78db4..2e1f8ec 100644
--- a/examples/xmlpatterns/recipes/recipes.pro
+++ b/examples/xmlpatterns/recipes/recipes.pro
@@ -1,4 +1,4 @@
-QT += xmlpatterns
+QT += widgets xmlpatterns
FORMS += forms/querywidget.ui \
forms/querywidget_mobiles.ui
HEADERS = querymainwindow.h ../shared/xmlsyntaxhighlighter.h
diff --git a/examples/xmlpatterns/schema/schema.pro b/examples/xmlpatterns/schema/schema.pro
index 4fda651..61b147c 100644
--- a/examples/xmlpatterns/schema/schema.pro
+++ b/examples/xmlpatterns/schema/schema.pro
@@ -1,4 +1,4 @@
-QT += xmlpatterns
+QT += widgets xmlpatterns
FORMS += schema.ui schema_mobiles.ui
HEADERS = mainwindow.h ../shared/xmlsyntaxhighlighter.h
RESOURCES = schema.qrc
diff --git a/examples/xmlpatterns/trafficinfo/main.cpp b/examples/xmlpatterns/trafficinfo/main.cpp
index 95acca5..78227ce 100644
--- a/examples/xmlpatterns/trafficinfo/main.cpp
+++ b/examples/xmlpatterns/trafficinfo/main.cpp
@@ -40,7 +40,7 @@
#include "mainwindow.h"
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
int main(int argc, char **argv)
{
diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.cpp b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
index 72a561c..4b14156 100644
--- a/examples/xmlpatterns/trafficinfo/mainwindow.cpp
+++ b/examples/xmlpatterns/trafficinfo/mainwindow.cpp
@@ -43,8 +43,8 @@
#include <QtCore/QSettings>
#include <QtCore/QTimer>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QApplication>
#include <QtGui/QBitmap>
#include <QtGui/QLinearGradient>
#include <QtGui/QMouseEvent>
diff --git a/examples/xmlpatterns/trafficinfo/mainwindow.h b/examples/xmlpatterns/trafficinfo/mainwindow.h
index 800131e..d451d33 100644
--- a/examples/xmlpatterns/trafficinfo/mainwindow.h
+++ b/examples/xmlpatterns/trafficinfo/mainwindow.h
@@ -44,7 +44,7 @@
#include "stationquery.h"
#include "timequery.h"
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
class MainWindow : public QWidget
{
diff --git a/examples/xmlpatterns/trafficinfo/stationdialog.h b/examples/xmlpatterns/trafficinfo/stationdialog.h
index 81a73e8..fa738f8 100644
--- a/examples/xmlpatterns/trafficinfo/stationdialog.h
+++ b/examples/xmlpatterns/trafficinfo/stationdialog.h
@@ -41,7 +41,7 @@
#ifndef STATIONDIALOG_H
#define STATIONDIALOG_H
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
#include "stationquery.h"
#include "ui_stationdialog.h"
diff --git a/examples/xmlpatterns/trafficinfo/trafficinfo.pro b/examples/xmlpatterns/trafficinfo/trafficinfo.pro
index d0aa7d2..8a12910 100644
--- a/examples/xmlpatterns/trafficinfo/trafficinfo.pro
+++ b/examples/xmlpatterns/trafficinfo/trafficinfo.pro
@@ -1,4 +1,4 @@
-QT += xmlpatterns
+QT += widgets xmlpatterns
HEADERS = mainwindow.h stationdialog.h stationquery.h timequery.h
SOURCES = main.cpp mainwindow.cpp stationdialog.cpp stationquery.cpp timequery.cpp
FORMS = stationdialog.ui