From 0fe41f1ac984f70037ea7717bc5660ddfaf6a4e5 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 24 May 2011 16:32:27 +0200 Subject: QtXmlPatterns: Widget library split. --- examples/xmlpatterns/filetree/filetree.pro | 2 +- examples/xmlpatterns/filetree/main.cpp | 2 +- examples/xmlpatterns/filetree/mainwindow.cpp | 3 ++- examples/xmlpatterns/recipes/querymainwindow.cpp | 3 ++- examples/xmlpatterns/recipes/recipes.pro | 2 +- examples/xmlpatterns/schema/schema.pro | 2 +- examples/xmlpatterns/trafficinfo/main.cpp | 2 +- examples/xmlpatterns/trafficinfo/mainwindow.cpp | 4 ++-- examples/xmlpatterns/trafficinfo/mainwindow.h | 2 +- examples/xmlpatterns/trafficinfo/stationdialog.h | 2 +- examples/xmlpatterns/trafficinfo/trafficinfo.pro | 2 +- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/examples/xmlpatterns/filetree/filetree.pro b/examples/xmlpatterns/filetree/filetree.pro index 943030b..bb24f77 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 +#include #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 +#include +#include #include #include 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 +#include +#include #include #include "querymainwindow.h" diff --git a/examples/xmlpatterns/recipes/recipes.pro b/examples/xmlpatterns/recipes/recipes.pro index ef01132..93b8bfc 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 6fa16ef..aa2162a 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 +#include 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 #include -#include -#include +#include +#include #include #include #include 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 +#include 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 +#include #include "stationquery.h" #include "ui_stationdialog.h" diff --git a/examples/xmlpatterns/trafficinfo/trafficinfo.pro b/examples/xmlpatterns/trafficinfo/trafficinfo.pro index 33ddc78..e35ff27 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 -- cgit v1.2.1 From eb545b4ddbf8f6a1f8ab10bf9de2c6a129486869 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 31 Aug 2011 16:18:11 +0200 Subject: Fix build. Change-Id: I2dd8794eab33214dffaf069919e3abaae79122b3 Reviewed-on: http://codereview.qt.nokia.com/3987 Reviewed-by: Friedemann Kleint --- src/xmlpatterns/schema/qxsdschemaparser_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmlpatterns/schema/qxsdschemaparser_p.h b/src/xmlpatterns/schema/qxsdschemaparser_p.h index 80d44a5..db3771c 100644 --- a/src/xmlpatterns/schema/qxsdschemaparser_p.h +++ b/src/xmlpatterns/schema/qxsdschemaparser_p.h @@ -70,7 +70,7 @@ #include #include #include -#include +#include #include QT_BEGIN_HEADER -- cgit v1.2.1 From 024b56232908af2083720c96a40666c325336141 Mon Sep 17 00:00:00 2001 From: Jani Uusi-Rantala Date: Mon, 5 Sep 2011 21:09:59 +0300 Subject: Build fix with latest refactored Qt5 load(qt_module_config) was missing from project file and including qtbase.pri seemed to be completely wrong. Change-Id: I6df54292c54988ff2a7168a83b5b79835810b6ed Reviewed-on: http://codereview.qt.nokia.com/4219 Reviewed-by: Qt Sanity Bot Reviewed-by: Gunnar Sletta --- src/xmlpatterns/xmlpatterns.pro | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro index 6ed3033..ccde1c8 100644 --- a/src/xmlpatterns/xmlpatterns.pro +++ b/src/xmlpatterns/xmlpatterns.pro @@ -1,23 +1,22 @@ load(qt_module) -TARGET = QtXmlPatterns -QPRO_PWD = $$PWD -QT = core-private \ - network +TARGET = QtXmlPatterns +QPRO_PWD = $$PWD CONFIG += module -MODULE_PRI = ../../modules/qt_xmlpatterns.pri +MODULE_PRI += ../../modules/qt_xmlpatterns.pri -DEFINES += QT_BUILD_XMLPATTERNS_LIB \ - QT_NO_USING_NAMESPACE +QT = core-private network + +DEFINES += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000 -unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \ - QtNetwork -include($$QT_SOURCE_TREE/src/qbase.pri) + +unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork + +load(qt_module_config) HEADERS += qtxmlpatternsversion.h -PRECOMPILED_HEADER = $$QT_SOURCE_TREE/src/corelib/global/qt_pch.h include($$PWD/common.pri) include($$PWD/acceltree/acceltree.pri) include($$PWD/api/api.pri) -- cgit v1.2.1