summaryrefslogtreecommitdiff
path: root/src/xmlpatterns
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-04 13:12:30 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-04 13:12:30 +0100
commit767effafb8fbb97ec9b85b775f191126a3111c3a (patch)
tree869f712738eee272508e3097c0cf4b716e00478a /src/xmlpatterns
parentf81f71eab22157ecb6542b3c99c81e022133b385 (diff)
parent9a30672d4a41c45123fbd2928d7e55132dfec34f (diff)
downloadqtxmlpatterns-767effafb8fbb97ec9b85b775f191126a3111c3a.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: src/xmlpatterns/api/qcoloroutput_p.h src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h sync.profile Change-Id: Ibf1d2ab42c4316d9fada397b1f1c0f37e65662dd
Diffstat (limited to 'src/xmlpatterns')
-rw-r--r--src/xmlpatterns/api/qcoloroutput_p.h5
-rw-r--r--src/xmlpatterns/common.pri2
-rw-r--r--src/xmlpatterns/doc/qtxmlpatterns.qdocconf7
3 files changed, 7 insertions, 7 deletions
diff --git a/src/xmlpatterns/api/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h
index bd2d5a5..bdcdc8c 100644
--- a/src/xmlpatterns/api/qcoloroutput_p.h
+++ b/src/xmlpatterns/api/qcoloroutput_p.h
@@ -70,8 +70,9 @@ namespace QPatternist
ForegroundShift = 10,
BackgroundShift = 20,
SpecialShift = 20,
- ForegroundMask = 0xffc00,
- BackgroundMask = 0xfff00000
+// ### FIXME: this looks very suspicious. Make ForegroundShift = 0x10 etc?
+ ForegroundMask = 0x1f << ForegroundShift,
+ BackgroundMask = 0x7 << BackgroundShift
};
public:
diff --git a/src/xmlpatterns/common.pri b/src/xmlpatterns/common.pri
index 27253d8..5c7b8b7 100644
--- a/src/xmlpatterns/common.pri
+++ b/src/xmlpatterns/common.pri
@@ -14,5 +14,3 @@ INCLUDEPATH += $$PWD/acceltree \
$$PWD/type \
$$PWD/utils
-DEPENDPATH += $$INCLUDEPATH
-
diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf
index 85453f7..22e9af1 100644
--- a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf
+++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf
@@ -16,7 +16,7 @@ headerdirs += ..
imagedirs += images
sourcedirs += ..
-depends += qtcore qtxml qtwidgets
+depends += qtcore qtxml qtwidgets qtdesigner
# The following parameters are for creating a qhp file, the qhelpgenerator
# program can convert the qhp file into a qch file which can be opened in
@@ -36,11 +36,12 @@ qhp.qtxmlpatterns.namespace = org.qt-project.qtxmlpatterns.500
# Title for the package, will be the main title for the package in
# Assistant/Creator.
-qhp.qtxmlpatterns.indexTitle = Qt XML Patterns Documentation
+qhp.qtxmlpatterns.indexTitle = Qt XML Patterns
# Only update the name of the project for the next variables.
qhp.qtxmlpatterns.virtualFolder = qtxmlpatterns
qhp.qtxmlpatterns.subprojects = classes
-qhp.qtxmlpatterns.subprojects.classes.title = Qt XML Patterns C++ Classes
+qhp.qtxmlpatterns.subprojects.classes.title = C++ Classes
+qhp.qtxmlpatterns.subprojects.classes.indexTitle = Qt XML Patterns C++ Classes
qhp.qtxmlpatterns.subprojects.classes.selectors = class fake:headerfile
qhp.qtxmlpatterns.subprojects.classes.sortPages = true