summaryrefslogtreecommitdiffstats
path: root/addon
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2010-06-03 09:24:48 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2010-06-03 09:24:48 (GMT)
commita1528245b280f1068daad8cd850ea345a3f8b568 (patch)
tree060dc6ccdb347682a1d4b73ab3098d95599532f2 /addon
parenta3b06c4fd310fdeda48a4730139cee09b5302072 (diff)
downloadDoxygen-a1528245b280f1068daad8cd850ea345a3f8b568.zip
Doxygen-a1528245b280f1068daad8cd850ea345a3f8b568.tar.gz
Doxygen-a1528245b280f1068daad8cd850ea345a3f8b568.tar.bz2
Release-1.6.3-20100603
Diffstat (limited to 'addon')
-rw-r--r--addon/doxywizard/Makefile.in2
-rw-r--r--addon/doxywizard/doxywizard.cpp9
-rw-r--r--addon/doxywizard/doxywizard.icobin0 -> 84070 bytes
-rw-r--r--addon/doxywizard/doxywizard.pro.in1
-rw-r--r--addon/doxywizard/doxywizard.rc1
5 files changed, 10 insertions, 3 deletions
diff --git a/addon/doxywizard/Makefile.in b/addon/doxywizard/Makefile.in
index 75a3a6d..6f7c4bd 100644
--- a/addon/doxywizard/Makefile.in
+++ b/addon/doxywizard/Makefile.in
@@ -10,7 +10,7 @@
# See the GNU General Public License for more details.
#
-QMAKE=qmake
+QMAKE=qmake $(MKSPECS)
all: Makefile.doxywizard
$(MAKE) -f Makefile.doxywizard
diff --git a/addon/doxywizard/doxywizard.cpp b/addon/doxywizard/doxywizard.cpp
index 329f60e..5299c10 100644
--- a/addon/doxywizard/doxywizard.cpp
+++ b/addon/doxywizard/doxywizard.cpp
@@ -4,6 +4,10 @@
#include "expert.h"
#include "wizard.h"
+#ifdef WIN32
+#include <windows.h>
+#endif
+
#define MAX_RECENT_FILES 10
const int messageTimeout = 5000; //!< status bar message timeout in millisec.
@@ -520,12 +524,13 @@ void MainWindow::showHtmlOutput()
QFileInfo fi(indexFile);
// TODO: the following doesn't seem to work with IE
#ifdef WIN32
- QString indexUrl(QString::fromAscii("file:///"));
+ //QString indexUrl(QString::fromAscii("file:///"));
+ ShellExecute(NULL, L"open", fi.absoluteFilePath().utf16(), NULL, NULL, SW_SHOWNORMAL);
#else
QString indexUrl(QString::fromAscii("file://"));
-#endif
indexUrl+=fi.absoluteFilePath();
QDesktopServices::openUrl(QUrl(indexUrl));
+#endif
}
void MainWindow::saveLog()
diff --git a/addon/doxywizard/doxywizard.ico b/addon/doxywizard/doxywizard.ico
new file mode 100644
index 0000000..d91f219
--- /dev/null
+++ b/addon/doxywizard/doxywizard.ico
Binary files differ
diff --git a/addon/doxywizard/doxywizard.pro.in b/addon/doxywizard/doxywizard.pro.in
index b9f8f70..3b40576 100644
--- a/addon/doxywizard/doxywizard.pro.in
+++ b/addon/doxywizard/doxywizard.pro.in
@@ -25,3 +25,4 @@ SOURCES += doxywizard.cpp ../../src/version.cpp expert.cpp wizard.cpp \
inputbool.cpp inputstring.cpp inputint.cpp inputstrlist.cpp
LEXSOURCES += config.l
RESOURCES += doxywizard.qrc
+win32:RC_FILE += doxywizard.rc
diff --git a/addon/doxywizard/doxywizard.rc b/addon/doxywizard/doxywizard.rc
new file mode 100644
index 0000000..7f5327c
--- /dev/null
+++ b/addon/doxywizard/doxywizard.rc
@@ -0,0 +1 @@
+IDI_ICON1 ICON DISCARDABLE "doxywizard.ico"