Skip to content

Commit f6ef93a

Browse files
committed
Updating for 4.2.0
1 parent 12fe471 commit f6ef93a

3 files changed

Lines changed: 9 additions & 6 deletions

File tree

Doxygen.json.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
\"Name\" : \"Doxygen\",
3-
\"Version\" : \"0.4.4\",
3+
\"Version\" : \"0.4.5\",
44
\"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
55
\"Vendor\" : \"Fabien Poussin\",
66
\"Copyright\" : \"Fabien Poussin\",
@@ -17,4 +17,3 @@
1717
\"Url\" : \"https://github.com/fpoussin/qtcreator-doxygen\",
1818
$$dependencyList
1919
}
20-

doxygen.pro

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ RESOURCES += doxygen.qrc
2828

2929
## set the QTC_SOURCE environment variable to override the setting here
3030
QTCREATOR_SOURCES = $$(QTC_SOURCE)
31-
unix:isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=$$(HOME)/src/qt-creator-opensource-src-4.0.0
32-
win32:isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=D:\src\qt-creator-opensource-src-4.0.0
31+
unix:isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=$$(HOME)/src/qt-creator-opensource-src-4.2.0
32+
win32:isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=D:\src\qt-creator-opensource-src-4.2.0
3333

3434
## set the QTC_BUILD environment variable to override the setting here
3535
IDE_BUILD_TREE = $$(QTC_BUILD)
36-
unix:isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=$$(HOME)/qtcreator-4.0.0
36+
unix:isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=$$(HOME)/qtcreator-4.2.0
3737
win32:isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=D:\src\build-qtcreator-5_6_0_msvc2013-Release
3838

3939
## set the QTC_LIB_BASENAME environment variable to override the setting here
@@ -75,3 +75,6 @@ include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri)
7575

7676
DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
7777

78+
DISTFILES += \
79+
Doxygen.json.in
80+

doxygensettings.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "doxygenconstants.h"
2626
#include <coreplugin/icore.h>
2727
#include <utils/qtcassert.h>
28+
#include <utils/icon.h>
2829
#include <QtCore/QCoreApplication>
2930
#include <QIcon>
3031

@@ -40,7 +41,7 @@ DoxygenSettings::DoxygenSettings() :
4041
setDisplayName(tr("Doxygen"));
4142
setCategory(Core::Id::fromString(QString(Constants::DOXYGEN_SETTINGS_CATEGORY)));
4243
setDisplayCategory("Doxygen");
43-
setCategoryIcon(":/doxygen.png");
44+
setCategoryIcon(Utils::Icon(":/doxygen.png"));
4445
}
4546

4647
QWidget* DoxygenSettings::widget()

0 commit comments

Comments
 (0)