diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 09:33:49 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 09:34:07 +0200 |
| commit | e15d4c73762ca8b21acebe581c520bcd06a8d867 (patch) | |
| tree | ecf4903db11f3e8a58dadada2ceb38c869f761e3 /examples/xmlpatterns/filetree | |
| parent | 7137785c87497f8beb5bda20505466430c6b1521 (diff) | |
| parent | 024b56232908af2083720c96a40666c325336141 (diff) | |
| download | qtxmlpatterns-e15d4c73762ca8b21acebe581c520bcd06a8d867.tar.gz | |
Merge branch 'refactor'
Conflicts:
src/xmlpatterns/xmlpatterns.pro
Change-Id: I8d435220281ec372f23c98ab3c15c9a208bacad8
Diffstat (limited to 'examples/xmlpatterns/filetree')
| -rw-r--r-- | examples/xmlpatterns/filetree/filetree.pro | 2 | ||||
| -rw-r--r-- | examples/xmlpatterns/filetree/main.cpp | 2 | ||||
| -rw-r--r-- | examples/xmlpatterns/filetree/mainwindow.cpp | 3 |
3 files changed, 4 insertions, 3 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> |