diff options
-rw-r--r-- | dist/changes-5.0.1 | 22 | ||||
-rw-r--r-- | src/assistant/assistant/doc/qtassistant.qdocconf | 2 | ||||
-rw-r--r-- | src/assistant/help/doc/qthelp.qdocconf | 2 | ||||
-rw-r--r-- | src/designer/src/designer/doc/qtdesigner.qdocconf | 2 | ||||
-rw-r--r-- | src/designer/src/designer/doc/src/designer-manual.qdoc | 2 | ||||
-rw-r--r-- | src/designer/src/lib/uilib/formbuilder.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/plugins/plugins.pro | 3 | ||||
-rw-r--r-- | src/designer/src/src.pro | 2 | ||||
-rw-r--r-- | src/designer/src/uitools/doc/qtuitools.qdocconf | 2 | ||||
-rw-r--r-- | src/linguist/linguist/doc/qtlinguist.qdocconf | 2 |
10 files changed, 26 insertions, 15 deletions
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1 index fa12d6434..f476e80bc 100644 --- a/dist/changes-5.0.1 +++ b/dist/changes-5.0.1 @@ -22,15 +22,14 @@ information about a particular change. General Improvements -------------------- + - [QTBUG-28633] Fix bogus include paths in some pkg-config files + - [QTBUG-28689] Fix help URLs in tools. + - [QTBUG-28579] Doc: Correcting qhp links to the Linguist and Assistant examples + Third party components ---------------------- **************************************************************************** -* Library * -**************************************************************************** - - -**************************************************************************** * Platform Specific Changes * **************************************************************************** @@ -44,9 +43,22 @@ Third party components * Tools * **************************************************************************** +Qt Assistant +------------ + + - Fix warnings found by the headersclean test + - Move functions from an anonymous namespace in a header + +Qt DBus Viewer +-------------- + + - Try harder in matching the method signature + Qt Designer ----------- + - Fix warning about hidden overloaded virtual, found by Clang + Qt Help ------- diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf index 76e65903d..3c2689e49 100644 --- a/src/assistant/assistant/doc/qtassistant.qdocconf +++ b/src/assistant/assistant/doc/qtassistant.qdocconf @@ -7,7 +7,7 @@ url = http://qt-project.org/doc/qtassistant qhp.projects = QtAssistant qhp.QtAssistant.file = qtassistant.qhp -qhp.QtAssistant.namespace = org.qt-project.assistant.500 +qhp.QtAssistant.namespace = org.qt-project.assistant.501 qhp.QtAssistant.virtualFolder = assistant qhp.QtAssistant.indexTitle = Qt Assistant Manual diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf index 2d05db5a5..b2072adc6 100644 --- a/src/assistant/help/doc/qthelp.qdocconf +++ b/src/assistant/help/doc/qthelp.qdocconf @@ -10,7 +10,7 @@ examplesinstallpath = help qhp.projects = QtHelp qhp.QtHelp.file = qthelp.qhp -qhp.QtHelp.namespace = org.qt-project.qthelp.500 +qhp.QtHelp.namespace = org.qt-project.qthelp.501 qhp.QtHelp.virtualFolder = qthelp qhp.QtHelp.indexTitle = Qt Help qhp.QtHelp.indexRoot = diff --git a/src/designer/src/designer/doc/qtdesigner.qdocconf b/src/designer/src/designer/doc/qtdesigner.qdocconf index 5130ae5b0..dc04cae4f 100644 --- a/src/designer/src/designer/doc/qtdesigner.qdocconf +++ b/src/designer/src/designer/doc/qtdesigner.qdocconf @@ -7,7 +7,7 @@ url = http://qt-project.org/doc/qtdesigner qhp.projects = QtDesigner qhp.QtDesigner.file = qtdesigner.qhp -qhp.QtDesigner.namespace = org.qt-project.designer.500 +qhp.QtDesigner.namespace = org.qt-project.designer.501 qhp.QtDesigner.virtualFolder = qtdesigner qhp.QtDesigner.indexTitle = Qt Designer Manual diff --git a/src/designer/src/designer/doc/src/designer-manual.qdoc b/src/designer/src/designer/doc/src/designer-manual.qdoc index 3540d687b..6c852df29 100644 --- a/src/designer/src/designer/doc/src/designer-manual.qdoc +++ b/src/designer/src/designer/doc/src/designer-manual.qdoc @@ -2534,7 +2534,7 @@ pixmap property in the property editor. with specific plugin support for \QD. This is done with the following declarations: - \snippet customwidgetplugin/customwidgetplugin.pro 1 + \snippet customwidgetplugin/customwidgetplugin.pro 3 If Qt is configured to build in both debug and release modes, \QD will be built in release mode. When this occurs, it is necessary to ensure that diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp index fe4df79d0..dfa10807d 100644 --- a/src/designer/src/lib/uilib/formbuilder.cpp +++ b/src/designer/src/lib/uilib/formbuilder.cpp @@ -94,7 +94,7 @@ namespace QFormInternal { dynamically generate user interfaces at run-time use the QUiLoader class, found in the QtUiTools module. - \sa QAbstractFormBuilder, {QtUiTools Module} + \sa QAbstractFormBuilder, {Qt UI Tools} */ /*! diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro index 44f5e34e9..7cd16f2da 100644 --- a/src/designer/src/plugins/plugins.pro +++ b/src/designer/src/plugins/plugins.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs CONFIG += ordered -REQUIRES = !CONFIG(static,shared|static) # qtHaveModule(opengl): SUBDIRS += tools/view3d qtHaveModule(webkitwidgets): SUBDIRS += qwebview -# win32: contains(QT_CONFIG, activeqt): SUBDIRS += activeqt +# win32: qtHaveModule(activeqt): SUBDIRS += activeqt diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro index 9802c653d..64d1c3708 100644 --- a/src/designer/src/src.pro +++ b/src/designer/src/src.pro @@ -7,4 +7,4 @@ SUBDIRS = \ components \ designer -CONFIG(shared,shared|static):SUBDIRS += plugins +contains(QT_CONFIG, shared): SUBDIRS += plugins diff --git a/src/designer/src/uitools/doc/qtuitools.qdocconf b/src/designer/src/uitools/doc/qtuitools.qdocconf index 34407302b..793847f19 100644 --- a/src/designer/src/uitools/doc/qtuitools.qdocconf +++ b/src/designer/src/uitools/doc/qtuitools.qdocconf @@ -10,7 +10,7 @@ examplesinstallpath = uitools qhp.projects = QtUiTools qhp.QtUiTools.file = qtuitools.qhp -qhp.QtUiTools.namespace = org.qt-project.qtuitools.500 +qhp.QtUiTools.namespace = org.qt-project.qtuitools.501 qhp.QtUiTools.virtualFolder = qtuitools qhp.QtUiTools.indexTitle = Qt UI Tools qhp.QtHelp.indexRoot = diff --git a/src/linguist/linguist/doc/qtlinguist.qdocconf b/src/linguist/linguist/doc/qtlinguist.qdocconf index c09f52b63..6699f3173 100644 --- a/src/linguist/linguist/doc/qtlinguist.qdocconf +++ b/src/linguist/linguist/doc/qtlinguist.qdocconf @@ -7,7 +7,7 @@ url = http://qt-project.org/doc/qtlinguist qhp.projects = QtLinguist qhp.QtLinguist.file = qtlinguist.qhp -qhp.QtLinguist.namespace = org.qt-project.linguist.500 +qhp.QtLinguist.namespace = org.qt-project.linguist.501 qhp.QtLinguist.virtualFolder = qtlinguist qhp.QtLinguist.indexTitle = Qt Linguist Manual |