Browse Source

Windows build fixes

chirpmodem-v8.0.0
f4exb 8 years ago
parent
commit
8a0d0de573
  1. 8
      app/main.cpp
  2. 4
      sdrbase/webapi/webapirequestmapper.cpp

8
app/main.cpp

@ -34,9 +34,15 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo @@ -34,9 +34,15 @@ static int runQtApplication(int argc, char* argv[], qtwebapp::LoggerWithFile *lo
QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
*/
#ifdef _MSC_VER
QCoreApplication::setOrganizationName("f4exb");
QCoreApplication::setApplicationName("SDRangel");
QCoreApplication::setApplicationVersion("4.8.2");
#else
QCoreApplication::setOrganizationName(COMPANY);
QCoreApplication::setApplicationName(APPLICATION_NAME);
QCoreApplication::setApplicationVersion(SDRANGEL_VERSION);
QCoreApplication::setApplicationVersion(SDRANGEL_VERSION);
#endif
#if QT_VERSION >= 0x050600
QApplication::setAttribute(Qt::AA_EnableHighDpiScaling); // DPI support
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); //HiDPI pixmaps

4
sdrbase/webapi/webapirequestmapper.cpp

@ -49,7 +49,9 @@ WebAPIRequestMapper::WebAPIRequestMapper(QObject* parent) : @@ -49,7 +49,9 @@ WebAPIRequestMapper::WebAPIRequestMapper(QObject* parent) :
HttpRequestHandler(parent),
m_adapter(0)
{
#ifndef _MSC_VER
Q_INIT_RESOURCE(webapi);
#endif
qtwebapp::HttpDocrootSettings docrootSettings;
docrootSettings.path = ":/webapi";
m_staticFileController = new qtwebapp::StaticFileController(docrootSettings, parent);
@ -58,7 +60,9 @@ WebAPIRequestMapper::WebAPIRequestMapper(QObject* parent) : @@ -58,7 +60,9 @@ WebAPIRequestMapper::WebAPIRequestMapper(QObject* parent) :
WebAPIRequestMapper::~WebAPIRequestMapper()
{
delete m_staticFileController;
#ifndef _MSC_VER
Q_CLEANUP_RESOURCE(webapi);
#endif
}
void WebAPIRequestMapper::service(qtwebapp::HttpRequest& request, qtwebapp::HttpResponse& response)

Loading…
Cancel
Save