Updating for 4.2.0

fpoussin · Dec 15, 2016 · f6ef93a · f6ef93a
1 parent 12fe471
commit f6ef93a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Doxygen.json.in b/Doxygen.json.in
@@ -1,6 +1,6 @@
 {
     \"Name\" : \"Doxygen\",
-    \"Version\" : \"0.4.4\",
+    \"Version\" : \"0.4.5\",
     \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\",
     \"Vendor\" : \"Fabien Poussin\",
     \"Copyright\" : \"Fabien Poussin\",
@@ -17,4 +17,3 @@
     \"Url\" : \"https://github.com/fpoussin/qtcreator-doxygen\",
     $$dependencyList
 }
-
diff --git a/doxygen.pro b/doxygen.pro
@@ -28,12 +28,12 @@ RESOURCES += doxygen.qrc
 
 ## set the QTC_SOURCE environment variable to override the setting here
 QTCREATOR_SOURCES = $$(QTC_SOURCE)
-unix:isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=$$(HOME)/src/qt-creator-opensource-src-4.0.0
-win32:isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=D:\src\qt-creator-opensource-src-4.0.0
+unix:isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=$$(HOME)/src/qt-creator-opensource-src-4.2.0
+win32:isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=D:\src\qt-creator-opensource-src-4.2.0
 
 ## set the QTC_BUILD environment variable to override the setting here
 IDE_BUILD_TREE = $$(QTC_BUILD)
-unix:isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=$$(HOME)/qtcreator-4.0.0
+unix:isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=$$(HOME)/qtcreator-4.2.0
 win32:isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=D:\src\build-qtcreator-5_6_0_msvc2013-Release
 
 ## set the QTC_LIB_BASENAME environment variable to override the setting here
@@ -75,3 +75,6 @@ include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri)
 
 DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
 
+DISTFILES += \
+    Doxygen.json.in
+
diff --git a/doxygensettings.cpp b/doxygensettings.cpp
@@ -25,6 +25,7 @@
 #include "doxygenconstants.h"
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
+#include <utils/icon.h>
 #include <QtCore/QCoreApplication>
 #include <QIcon>
 
@@ -40,7 +41,7 @@ DoxygenSettings::DoxygenSettings() :
     setDisplayName(tr("Doxygen"));
     setCategory(Core::Id::fromString(QString(Constants::DOXYGEN_SETTINGS_CATEGORY)));
     setDisplayCategory("Doxygen");
-    setCategoryIcon(":/doxygen.png");
+    setCategoryIcon(Utils::Icon(":/doxygen.png"));
 }
 
 QWidget* DoxygenSettings::widget()