diff --git a/gui/checkdialog.cpp b/gui/checkdialog.cpp index 565c65cda..6a28732d9 100644 --- a/gui/checkdialog.cpp +++ b/gui/checkdialog.cpp @@ -84,7 +84,7 @@ CheckDialog::CheckDialog(QSettings &programSettings) : mSecurity = AddCheckbox(layout, tr("Security"), tr("Check security"), false); //Vcl - mVcl = AddCheckbox(layout, tr("Vcl"), tr("Check vcl"), false); + //mVcl = AddCheckbox(layout, tr("Vcl"), tr("Check vcl"), false); @@ -227,7 +227,7 @@ Settings CheckDialog::GetSettings() result._xml = CheckStateToBool(mXml->checkState()); result._unusedFunctions = CheckStateToBool(mUnusedFunctions->checkState()); result._security = CheckStateToBool(mSecurity->checkState()); - result._vcl = CheckStateToBool(mVcl->checkState()); + //result._vcl = CheckStateToBool(mVcl->checkState()); result._jobs = mJobs->text().toInt(); return result; } diff --git a/src/filelister.cpp b/src/filelister.cpp index 696652704..90fecce3f 100644 --- a/src/filelister.cpp +++ b/src/filelister.cpp @@ -32,8 +32,10 @@ #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__) #include #include +#if !defined(QT_CORE_LIB) #pragma comment(lib, "shlwapi.lib") #endif +#endif std::string FileLister::simplifyPath(const char *originalPath) { @@ -150,12 +152,22 @@ void FileLister::RecursiveAddFiles(std::vector &filenames, const st } #endif +/////////////////////////////////////////////////////////////////////////////// +////// This code is for MinGW and Qt /////////////////////////// +/////////////////////////////////////////////////////////////////////////////// +#if defined(__MINGW32__) && defined(QT_CORE_LIB) +void FileLister::RecursiveAddFiles(std::vector &filenames, const std::string &path, bool recursive) +{ + //This method is not used by Qt build +} + +#endif /////////////////////////////////////////////////////////////////////////////// ////// This code is for Borland C++ and Visual C++ //////////////////////////// /////////////////////////////////////////////////////////////////////////////// -#if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__) +#if (defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)) && !defined(QT_CORE_LIB) void FileLister::RecursiveAddFiles(std::vector &filenames, const std::string &path, bool recursive) {