diff --git a/src/proxy/proxyPython.pro b/src/proxy/proxyPython.pro index c8cc51f..eaa3614 100644 --- a/src/proxy/proxyPython.pro +++ b/src/proxy/proxyPython.pro @@ -36,7 +36,7 @@ RC_FILE += \ include(../plugin_template.pri) -INCLUDEPATH += "../../pythonRunner" "$(BOOSTPATH)" +INCLUDEPATH += "../../pythonRunner" "$${BOOSTPATH}" WINPWD = $$PWD WINPWD ~= s,/,$$QMAKE_DIR_SEP,g diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp index 5d72e29..46ea87e 100644 --- a/src/proxy/proxypython.cpp +++ b/src/proxy/proxypython.cpp @@ -163,7 +163,7 @@ bool ProxyPython::init(IOrganizer *moInfo) QString ProxyPython::name() const { - return tr("Python Proxy"); + return "Python Proxy"; } QString ProxyPython::author() const diff --git a/src/runner/error.cpp b/src/runner/error.cpp index a1ae993..62a2346 100644 --- a/src/runner/error.cpp +++ b/src/runner/error.cpp @@ -1,4 +1,6 @@ +#ifndef Q_MOC_RUN #include +#endif #include #include diff --git a/src/runner/proxypluginwrappers.h b/src/runner/proxypluginwrappers.h index 49e87df..089ce35 100644 --- a/src/runner/proxypluginwrappers.h +++ b/src/runner/proxypluginwrappers.h @@ -5,7 +5,6 @@ #include #include #include -#include #ifndef Q_MOC_RUN #include diff --git a/src/runner/pythonRunner.pro b/src/runner/pythonRunner.pro index aa11767..dbffac8 100644 --- a/src/runner/pythonRunner.pro +++ b/src/runner/pythonRunner.pro @@ -13,7 +13,13 @@ CONFIG += warn_on DEFINES += PYTHONRUNNER_LIBRARY # suppress a few warnings caused by boost vs vc++ paranoia -DEFINES += _SCL_SECURE_NO_WARNINGS +DEFINES += _SCL_SECURE_NO_WARNINGS -DHAVE_ROUND + + +!include(../LocalPaths.pri) { + message("paths to required libraries need to be set up in LocalPaths.pri") +} + SOURCES += pythonrunner.cpp \ gilock.cpp \ @@ -36,8 +42,8 @@ CONFIG(debug, debug|release) { QMAKE_LFLAGS += /DEBUG } -INCLUDEPATH += "$(BOOSTPATH)" "$$(PYTHONPATH)/include" "$$(PYTHONPATH)/Lib/site-packages/PyQt4/include" -LIBS += -L"$$(PYTHONPATH)/libs" -L"$(BOOSTPATH)/stage/lib" +INCLUDEPATH += "$${BOOSTPATH}" "$${PYTHONPATH}/include" "$${PYTHONPATH}/Lib/site-packages/PyQt4/include" +LIBS += -L"$${PYTHONPATH}/libs" -L"$${BOOSTPATH}/stage/lib" LIBS += -lpython27 INCLUDEPATH += ../uibase diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 8c5760c..d79a695 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -5,7 +5,6 @@ #pragma warning( disable : 4100 ) #pragma warning( disable : 4996 ) -#include #include #include "uibasewrappers.h" #include "pythonpluginwrapper.h"