From e50217fd8fa55228bb145f004cabc98814589351 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Mon, 3 May 2010 10:35:36 +0200 Subject: qdoc: Added breadcrumbs for most other pages. --- doc/src/classes.qdoc | 4 ++-- tools/qdoc3/htmlgenerator.cpp | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/src/classes.qdoc b/doc/src/classes.qdoc index 6ba31a2..1552f56 100644 --- a/doc/src/classes.qdoc +++ b/doc/src/classes.qdoc @@ -59,7 +59,7 @@ /*! \page classes.html - \title All Qt Classes (main index) + \title All Qt Classes \ingroup classlists \brief If you know the name of the class you want, find it here. @@ -146,7 +146,7 @@ /*! \page functions.html - \title All Functions (main index) + \title All Functions \ingroup funclists \brief All documented Qt functions listed alphabetically with a diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index fb3c3f3..a0cd560 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -1716,6 +1716,10 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, else if (node->subType() == Node::Group) { if (fn->name() == QString("modules")) out() << "
  • All Modules
    • "; + else { + out() << "
  • name() << "\">" << title + << "
    • "; + } } else if (node->subType() == Node::Page) { if (fn->name() == QString("examples.html")) { @@ -1729,6 +1733,10 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title, else if (fn->name() == QString("namespaces.html")) { out() << "
  • All Namespaces
    • "; } + else { + out() << "
  • name() << "\">" << title + << "
    • "; + } } else if (node->subType() == Node::QmlClass) { } -- cgit v0.12 From bcec71fef776de7440438f78edd949a64d33d041 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 May 2010 12:19:04 +0200 Subject: s/INCPATH/INCLUDEPATH/ --- mkspecs/features/moc.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index e806ef6..d12f5ad 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -12,7 +12,7 @@ isEmpty(QMAKE_EXT_CPP_MOC):QMAKE_EXT_CPP_MOC = .moc # has too many includes. We do this to overcome a command-line limit on Win < XP INCLUDETEMP= WIN_INCLUDETEMP= -win32:count($$list($$INCPATH), 40, >) { +win32:count($$list($$INCLUDEPATH), 40, >) { INCLUDETEMP = $$MOC_DIR/mocinclude.tmp WIN_INCLUDETEMP=$$INCLUDETEMP @@ -28,7 +28,7 @@ win32:count($$list($$INCPATH), 40, >) { unset(INCFILELIST) RET = - for(incfile, $$list($$INCPATH)) { + for(incfile, $$list($$INCLUDEPATH)) { INCFILELIST = -I$$incfile isEmpty(RET): RET += @echo $$INCFILELIST> $$WIN_INCLUDETEMP $$EOC else: RET += @echo $$INCFILELIST>> $$WIN_INCLUDETEMP $$EOC -- cgit v0.12 From 184c2b0ad676a98cfbcd76212178a4b4c29a54f4 Mon Sep 17 00:00:00 2001 From: Romain Pokrzywka Date: Mon, 3 May 2010 12:20:36 +0200 Subject: only add phonon and scripttools dependencies if they're available, otherwise linking will fail Merge-request: 591 Reviewed-by: Oswald Buddenhagen --- tools/qml/qml.pro | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index 7a101d0..b33d48b 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -14,10 +14,14 @@ target.path = $$[QT_INSTALL_BINS] INSTALLS += target wince* { -QT += scripttools \ - xml \ - phonon + QT += xml + contains(QT_CONFIG, scripttools) { + QT += scripttools + } + contains(QT_CONFIG, phonon) { + QT += phonon + } contains(QT_CONFIG, xmlpatterns) { QT += xmlpatterns } -- cgit v0.12 From def0ab445ffc747ed78ca7b90f84f3d68c722f03 Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Wed, 28 Apr 2010 00:58:23 +0200 Subject: Fix a small typo in setColor description (brush -> color) --- src/gui/kernel/qpalette.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 6e8c90e..98e8f66 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -795,7 +795,7 @@ const QBrush &QPalette::brush(ColorGroup gr, ColorRole cr) const /*! \fn void QPalette::setColor(ColorGroup group, ColorRole role, const QColor &color) - Sets the brush in the specified color \a group, used for the given + Sets the color in the specified color \a group, used for the given color \a role, to the specified solid \a color. \sa setBrush() color() ColorRole -- cgit v0.12 From cfa3b8f2a7a3b3122fdff7781e32066e0d7f8d66 Mon Sep 17 00:00:00 2001 From: Laszlo Papp Date: Sat, 1 May 2010 13:15:49 +0200 Subject: Fix a small typo: therfore -> therefore --- src/xmlpatterns/type/qschematype_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xmlpatterns/type/qschematype_p.h b/src/xmlpatterns/type/qschematype_p.h index 1b26fb8..ff8b86b 100644 --- a/src/xmlpatterns/type/qschematype_p.h +++ b/src/xmlpatterns/type/qschematype_p.h @@ -174,7 +174,7 @@ namespace QPatternist * a QXmlName instance stored as a member. * * If the type code was refactored to not be store globally and - * therfore by design would be tied to a name pool, this argument could + * therefore by design would be tied to a name pool, this argument could * be removed. */ virtual QXmlName name(const NamePool::Ptr &np) const = 0; -- cgit v0.12