summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-18 16:07:50 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-02-18 16:07:50 +0100
commit0a575c4bdafd9fb4827b9c51c2c5e2d02a3837cf (patch)
treefdb9f3f708f1bce053115e12089bf37a337f3216 /tools
parentbc308b058e39161dc936dd3e9bd20983d8d1c1fe (diff)
parentc79d19ae9d4feb353236db49381d8c6b9b032a4b (diff)
downloadqtxmlpatterns-0a575c4bdafd9fb4827b9c51c2c5e2d02a3837cf.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Iafbd5b538ebe0254d5fcea0fad0e58f8b66c1084
Diffstat (limited to 'tools')
-rw-r--r--tools/xmlpatterns/xmlpatterns.pro17
-rw-r--r--tools/xmlpatternsvalidator/xmlpatternsvalidator.pro16
2 files changed, 4 insertions, 29 deletions
diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro
index d295efc..d349a91 100644
--- a/tools/xmlpatterns/xmlpatterns.pro
+++ b/tools/xmlpatterns/xmlpatterns.pro
@@ -1,17 +1,4 @@
-TEMPLATE = app
-TARGET = xmlpatterns
-QT -= gui
-QT += xmlpatterns-private
-
-DESTDIR = $$QT.xmlpatterns.bins
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
-
-# This ensures we get stderr and stdout on Windows.
-CONFIG += console
-
-# This ensures that this is a command-line program on OS X and not a GUI application.
-CONFIG -= app_bundle
+QT = core xmlpatterns-private
# Note that qcoloroutput.cpp and qcoloringmessagehandler.cpp are also used internally
# in libQtXmlPatterns. See src/xmlpatterns/api/api.pri.
@@ -24,4 +11,4 @@ HEADERS = main.h \
qapplicationargument.cpp \
qapplicationargumentparser.cpp
-
+load(qt_tool)
diff --git a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro
index d5ab070..af9469f 100644
--- a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro
+++ b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro
@@ -1,18 +1,6 @@
-TEMPLATE = app
-TARGET = xmlpatternsvalidator
-QT -= gui
-QT += xmlpatterns
-
-DESTDIR = $$QT.xmlpatterns.bins
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
-
-# This ensures we get stderr and stdout on Windows.
-CONFIG += console
-
-# This ensures that this is a command-line program on OS X and not a GUI application.
-CONFIG -= app_bundle
+QT = core xmlpatterns
SOURCES = main.cpp
HEADERS = main.h
+load(qt_tool)