walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

GUI: quick fix for #1957 (Unable to compile gui.pro with Qt Creator in Windows)

This commit is contained in:
Daniel Marjamäki 2010-08-19 18:21:42 +02:00
parent cfa7b4906e
commit 2fea5f01d6
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/gui.pro
View File

@ -95,6 +95,6 @@ win32 {
DEFINES += _CRT_SECURE_NO_WARNINGS
RC_FILE = cppcheck-gui.rc
HEADERS += ../cli/resource.h
LIBS += -lshlwapi -lhtmlhelp
LIBS += -lshlwapi
}

15
gui/mainwindow.cpp
View File

@ -36,12 +36,6 @@
#include "logview.h"
#include "filelist.h"
// HTMLHelp is only available in Windows
#ifdef WIN32
#include <windows.h>
#include <htmlhelp.h>
#endif
MainWindow::MainWindow() :
mSettings(new QSettings("Cppcheck", "Cppcheck-GUI", this)),
mApplications(new ApplicationList(this)),
@ -89,12 +83,7 @@ MainWindow::MainWindow() :
connect(mUI.mActionNewProjectFile, SIGNAL(triggered()), this, SLOT(NewProjectFile()));
connect(mUI.mActionOpenProjectFile, SIGNAL(triggered()), this, SLOT(OpenProjectFile()));
#ifdef WIN32
connect(mUI.mActionHelpContents, SIGNAL(triggered()), this, SLOT(OpenHelpContents()));
#else
// Hide if not Windows
mUI.mActionHelpContents->setVisible(false);
#endif
CreateLanguageMenuItems();
LoadSettings();
@ -662,13 +651,13 @@ void MainWindow::OpenHelpContents()
void MainWindow::OpenHtmlHelpContents()
{
#ifdef WIN32
/*
QString file("/cppcheck.chm");
QString exeFolder = QDir::currentPath();
exeFolder += file;
exeFolder = QDir::toNativeSeparators(exeFolder);
HtmlHelp(NULL, exeFolder.utf16(), HH_DISPLAY_TOPIC, NULL);
#endif // WIN32
*/
}
void MainWindow::OpenProjectFile()