diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 5 | ||||
| -rw-r--r-- | src/corelib/doc/qtcore.qdocconf | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index d65ed4aa9f..b83b2bac1e 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -14,10 +14,9 @@ irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused # otherwise mingw headers do not declare common functions like putenv win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x -load(qt_module) - QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf -QMAKE_DOCS_INDEX = ../../doc + +load(qt_module) include(animation/animation.pri) include(arch/arch.pri) diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf index 36db213f69..a2cb2f2cfd 100644 --- a/src/corelib/doc/qtcore.qdocconf +++ b/src/corelib/doc/qtcore.qdocconf @@ -1,5 +1,5 @@ -include(../../../doc/global/qt-html-templates-offline.qdocconf) -include(../../../doc/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtCore description = Qt Core Reference Documentation @@ -29,7 +29,6 @@ qhp.QtCore.subprojects.examples.title = Qt Core Examples qhp.QtCore.subprojects.examples.indexTitle = Qt Core Examples qhp.QtCore.subprojects.examples.selectors = fake:example -outputdir = ../../../doc/qtcore tagfile = ../../../doc/qtcore/qtcore.tags depends += qtwidgets |