Commit 30308325 authored by Victor Yacovlev's avatar Victor Yacovlev

Updated to next beta

parent b8374b55
......@@ -4,7 +4,7 @@
# For manual build change this line to something line:
# OutFile "kumir2-...exe"
#!include outfilename.nsh
OutFile kumir2-2.1.0-beta5.exe
OutFile kumir2-2.1.0-beta6.exe
Name "-2.x"
InstallDir "$PROGRAMFILES\Kumir2x"
......
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui REQUIRED)
project(Actor_Colorer)
cmake_minimum_required(VERSION 2.8.3)
if(NOT DEFINED USE_QT)
set(USE_QT 4)
endif(NOT DEFINED USE_QT)
if(${USE_QT} GREATER 4)
# Find Qt5
find_package(Qt5 5.3.0 COMPONENTS Core Widgets REQUIRED)
include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} BEFORE)
set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
set(MOC_PARAMS "-I${_qt5Core_install_prefix}/include/QtCore")
else()
# Find Qt4
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtSvg REQUIRED)
include(${QT_USE_FILE})
endif()
find_package(PythonInterp 2.6 REQUIRED)
include (${QT_USE_FILE})
include(../../kumir2_plugin.cmake)
set(SOURCES
......@@ -39,6 +56,7 @@ add_custom_target(
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_colorermodulebase.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE}
${MOC_PARAMS}
-I${CMAKE_SOURCE_DIR}/src/shared
-o${CMAKE_CURRENT_BINARY_DIR}/_colorermodulebase.moc.cpp
${CMAKE_CURRENT_BINARY_DIR}/_colorermodulebase.h
......@@ -48,6 +66,7 @@ add_custom_command(
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/_colorerplugin.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE}
${MOC_PARAMS}
-I${CMAKE_SOURCE_DIR}/src/shared
-o${CMAKE_CURRENT_BINARY_DIR}/_colorerplugin.moc.cpp
${CMAKE_CURRENT_BINARY_DIR}/_colorerplugin.h
......@@ -64,7 +83,11 @@ set(MOC_SOURCES_GENERATED
_colorerplugin.moc.cpp
)
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
if(${USE_QT} GREATER 4)
qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
else()
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
endif()
install(
FILES ${PLUGIN_OUTPUT_PATH}/Actor_Colorer.pluginspec
......
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui REQUIRED)
project(ActorDraw)
cmake_minimum_required(VERSION 2.8.3)
if(NOT DEFINED USE_QT)
set(USE_QT 4)
endif(NOT DEFINED USE_QT)
if(${USE_QT} GREATER 4)
# Find Qt5
find_package(Qt5 5.3.0 COMPONENTS Core Widgets REQUIRED)
include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} BEFORE)
set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
set(MOC_PARAMS "-I${_qt5Core_install_prefix}/include/QtCore")
else()
# Find Qt4
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtSvg REQUIRED)
include(${QT_USE_FILE})
endif()
find_package(PythonInterp 2.6 REQUIRED)
include (${QT_USE_FILE})
include(../../kumir2_plugin.cmake)
set(SOURCES
......@@ -39,6 +56,7 @@ add_custom_target(
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/drawmodulebase.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE}
${MOC_PARAMS}
-I${CMAKE_SOURCE_DIR}/src/shared
-o${CMAKE_CURRENT_BINARY_DIR}/drawmodulebase.moc.cpp
${CMAKE_CURRENT_BINARY_DIR}/drawmodulebase.h
......@@ -48,6 +66,7 @@ add_custom_command(
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/drawplugin.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE}
${MOC_PARAMS}
-I${CMAKE_SOURCE_DIR}/src/shared
-o${CMAKE_CURRENT_BINARY_DIR}/drawplugin.moc.cpp
${CMAKE_CURRENT_BINARY_DIR}/drawplugin.h
......@@ -64,7 +83,11 @@ set(MOC_SOURCES_GENERATED
drawplugin.moc.cpp
)
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
if(${USE_QT} GREATER 4)
qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
else()
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
endif()
install(
FILES ${PLUGIN_OUTPUT_PATH}/ActorDraw.pluginspec
......
......@@ -232,7 +232,8 @@ namespace ActorDraw {
texts.append(addSimpleText(Text,font));
texts.last()->scale(0.001,0.001);
// texts.last()->scale(0.001,0.001);
texts.last()->setScale(0.001);
texts.last()->setPos(from.x(), from.y()-fontMetric.boundingRect("OOOXX").height()/1000);
texts.last()->setPen(QPen(color));
return widthChar*Text.length();
......@@ -1101,12 +1102,12 @@ void DrawModule::drawNet()
mPen->setZValue(100);
mPen->setBrush(QBrush(QColor("black")));
CurScene->addItem(mPen);
mPen->scale(0.5,0.5);
mPen->scale(0.5,0.5);
mPen->scale(0.5,0.5);
mPen->scale(0.5,0.5);
mPen->scale(0.5,0.5);
// mPen->scale(0.5,0.5);
// mPen->scale(0.5,0.5);
// mPen->scale(0.5,0.5);
// mPen->scale(0.5,0.5);
// mPen->scale(0.5,0.5);
mPen->setScale(0.5*5*mPen->scale());
mPen->setZValue(100);
......
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtScript QtSvg REQUIRED)
find_package(PythonInterp 2.6 REQUIRED)
project(ActorIsometricRobot)
cmake_minimum_required(VERSION 2.8.3)
if(NOT DEFINED USE_QT)
set(USE_QT 4)
endif(NOT DEFINED USE_QT)
include (${QT_USE_FILE})
if(${USE_QT} GREATER 4)
# Find Qt5
find_package(Qt5 5.3.0 COMPONENTS Core Widgets Script Svg REQUIRED)
include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Script_INCLUDE_DIRS} ${Qt5Svg_INCLUDE_DIRS} BEFORE)
set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Script_LIBRARIES} ${Qt5Svg_LIBRARIES})
set(MOC_PARAMS "-I${_qt5Core_install_prefix}/include/QtCore")
else()
# Find Qt4
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtSvg QtScript REQUIRED)
include(${QT_USE_FILE})
endif()
find_package(PythonInterp 2.6 REQUIRED)
include(../../kumir2_plugin.cmake)
set(SOURCES
......@@ -44,13 +60,13 @@ add_custom_target(ActorIsometricRobotPluginSpec ALL ${CMAKE_COMMAND} -E copy ${C
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/isometricrobotmodulebase.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/isometricrobotmodulebase.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/isometricrobotmodulebase.h
COMMAND ${QT_MOC_EXECUTABLE} ${MOC_PARAMS} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/isometricrobotmodulebase.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/isometricrobotmodulebase.h
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/isometricrobotmodulebase.h
)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/isometricrobotplugin.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/isometricrobotplugin.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/isometricrobotplugin.h
COMMAND ${QT_MOC_EXECUTABLE} ${MOC_PARAMS} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/isometricrobotplugin.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/isometricrobotplugin.h
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/isometricrobotplugin.h
)
......@@ -64,8 +80,13 @@ set(MOC_SOURCES2
isometricrobotplugin.moc.cpp
)
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
qt4_wrap_ui(UI_SOURCES ${FORMS})
if(${USE_QT} GREATER 4)
qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
qt5_wrap_ui(UI_SOURCES ${FORMS})
else()
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
qt4_wrap_ui(UI_SOURCES ${FORMS})
endif()
install(FILES ${PLUGIN_OUTPUT_PATH}/ActorIsometricRobot.pluginspec DESTINATION ${PLUGINS_DIR})
handleTranslation(ActorIsometricRobot)
......
......@@ -2,7 +2,11 @@
#define CELLGRAPHICSITEM_H
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
namespace Robot25D {
......
......@@ -2,7 +2,11 @@
#define GRAPHICSIMAGEITEM_H
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
namespace Robot25D {
......
......@@ -186,7 +186,7 @@ void Robot25DWindow::handleLoadAction()
const QString fileName = QFileDialog::getOpenFileName(this
, tr("Load environment")
, lastDir
, tr("Environments")+QString::fromAscii(" (*.env.json)")
, tr("Environments")+QString::fromLatin1(" (*.env.json)")
);
if (!fileName.isEmpty()) {
s.setValue("Robot25D/LastDir", fileName);
......
#ifndef ROBOTCELL_H
#define ROBOTCELL_H
#include <QtGlobal>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#define LEFT_WALL 0x1
......
......@@ -34,10 +34,10 @@ extern bool parceJSON(const QScriptValue &value, Task &task)
if (!strData.isEmpty() && !mimetype.isEmpty()) {
QByteArray decoded;
if (encoding=="base64") {
decoded = QByteArray::fromBase64(strData.toAscii());
decoded = QByteArray::fromBase64(strData.toLatin1());
}
else if (encoding=="hex") {
decoded = QByteArray::fromHex(strData.toAscii());
decoded = QByteArray::fromHex(strData.toLatin1());
}
else {
decoded = strData.toLocal8Bit();
......@@ -83,7 +83,7 @@ QString encodeData(const QByteArray &data)
qDebug() << "Store binary data of size " << data.size() << " with MD5: " << hash.result().toHex();
QByteArray stage1 = qCompress(data, 9);
QByteArray stage2 = stage1.toBase64();
return QString::fromAscii(stage2);
return QString::fromLatin1(stage2);
}
extern QString generateJSON(const Task &task)
......@@ -96,7 +96,7 @@ extern QString generateJSON(const Task &task)
QString d = mime.startsWith("text/")? screenString(task.hintData) : encodeData(task.hintData);
bool compressed = !mime.startsWith("text/");
const QString encoding = mime.startsWith("text/")? "notencoded" : "base64";
hint = QString::fromAscii("{ mimetype: \"%1\", encoding: \"%4\", compressed: %2, data: \"%3\" }")
hint = QString::fromLatin1("{ mimetype: \"%1\", encoding: \"%4\", compressed: %2, data: \"%3\" }")
.arg(mime)
.arg(compressed? "true" : "false")
.arg(d)
......
......@@ -2,7 +2,11 @@
#define UTIL_H
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <QtSvg>
#define PI 3.14159
......
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui REQUIRED)
find_package(PythonInterp 2.6 REQUIRED)
project(ActorPainter)
cmake_minimum_required(VERSION 2.8.3)
if(NOT DEFINED USE_QT)
set(USE_QT 4)
endif(NOT DEFINED USE_QT)
include (${QT_USE_FILE})
if(${USE_QT} GREATER 4)
# Find Qt5
find_package(Qt5 5.3.0 COMPONENTS Core Widgets REQUIRED)
include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} BEFORE)
set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
set(MOC_PARAMS "-I${_qt5Core_install_prefix}/include/QtCore")
else()
# Find Qt4
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtSvg REQUIRED)
include(${QT_USE_FILE})
endif()
find_package(PythonInterp 2.6 REQUIRED)
include(../../kumir2_plugin.cmake)
set(SOURCES
......@@ -39,13 +55,13 @@ add_custom_target(ActorPainterPluginSpec ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CU
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/paintermodulebase.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/paintermodulebase.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/paintermodulebase.h
COMMAND ${QT_MOC_EXECUTABLE} ${MOC_PARAMS} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/paintermodulebase.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/paintermodulebase.h
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/paintermodulebase.h
)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/painterplugin.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/painterplugin.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/painterplugin.h
COMMAND ${QT_MOC_EXECUTABLE} ${MOC_PARAMS} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/painterplugin.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/painterplugin.h
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/painterplugin.h
)
......@@ -59,8 +75,13 @@ set(MOC_SOURCES2
painterplugin.moc.cpp
)
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
qt4_wrap_ui(UI_SOURCES ${FORMS})
if(${USE_QT} GREATER 4)
qt5_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
qt5_wrap_ui(UI_SOURCES ${FORMS})
else()
qt4_wrap_cpp(MOC_SOURCES ${MOC_HEADERS})
qt4_wrap_ui(UI_SOURCES ${FORMS})
endif()
install(FILES ${PLUGIN_OUTPUT_PATH}/ActorPainter.pluginspec DESTINATION ${PLUGINS_DIR})
handleTranslation(ActorPainter)
......
......@@ -7,7 +7,11 @@ You should change it corresponding to functionality.
*/
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "paintermodule.h"
#include "painterwindow.h"
#include "paintertools.h"
......@@ -77,49 +81,49 @@ static Color colorFromCss(const QString & css)
Color PainterModule::runCMYK(const int c, const int m, const int y, const int k)
{
return colorFromCss(QString::fromAscii("cmyk(%1,%2,%3,%4)").arg(c).arg(m).arg(y).arg(k));
return colorFromCss(QString::fromLatin1("cmyk(%1,%2,%3,%4)").arg(c).arg(m).arg(y).arg(k));
}
Color PainterModule::runCMYKA(const int c, const int m, const int y, const int k, const int a)
{
return colorFromCss(QString::fromAscii("cmyka(%1,%2,%3,%4,%5)").arg(c).arg(m).arg(y).arg(k).arg(a));
return colorFromCss(QString::fromLatin1("cmyka(%1,%2,%3,%4,%5)").arg(c).arg(m).arg(y).arg(k).arg(a));
}
Color PainterModule::runHSL(const int h, const int s, const int l)
{
return colorFromCss(QString::fromAscii("hsl(%1,%2,%3)").arg(h).arg(s).arg(l));
return colorFromCss(QString::fromLatin1("hsl(%1,%2,%3)").arg(h).arg(s).arg(l));
}
Color PainterModule::runHSLA(const int h, const int s, const int l, const int a)
{
return colorFromCss(QString::fromAscii("hsla(%1,%2,%3,%4)").arg(h).arg(s).arg(l).arg(a));
return colorFromCss(QString::fromLatin1("hsla(%1,%2,%3,%4)").arg(h).arg(s).arg(l).arg(a));
}
Color PainterModule::runHSV(const int h, const int s, const int v)
{
return colorFromCss(QString::fromAscii("hsv(%1,%2,%3)").arg(h).arg(s).arg(v));
return colorFromCss(QString::fromLatin1("hsv(%1,%2,%3)").arg(h).arg(s).arg(v));
}
Color PainterModule::runHSVA(const int h, const int s, const int v, const int a)
{
return colorFromCss(QString::fromAscii("hsva(%1,%2,%3,%4)").arg(h).arg(s).arg(v).arg(a));
return colorFromCss(QString::fromLatin1("hsva(%1,%2,%3,%4)").arg(h).arg(s).arg(v).arg(a));
}
Color PainterModule::runRGB(const int r, const int g, const int b)
{
return colorFromCss(QString::fromAscii("rgb(%1,%2,%3)").arg(r).arg(g).arg(b));
return colorFromCss(QString::fromLatin1("rgb(%1,%2,%3)").arg(r).arg(g).arg(b));
}
Color PainterModule::runRGBA(const int r, const int g, const int b, const int a)
{
return colorFromCss(QString::fromAscii("rgba(%1,%2,%3,%4)").arg(r).arg(g).arg(b).arg(a));
return colorFromCss(QString::fromLatin1("rgba(%1,%2,%3,%4)").arg(r).arg(g).arg(b).arg(a));
}
......@@ -167,7 +171,7 @@ void PainterModule::runFill(const int x, const int y)
canvasLock->lock();
canvas->setPixel(pnt, brush.color().rgb());
canvasLock->unlock();
view->update();
// view->update();
stack.push(QPoint(pnt.x()-1, pnt.y()));
stack.push(QPoint(pnt.x()+1, pnt.y()));
stack.push(QPoint(pnt.x(), pnt.y()-1));
......
......@@ -10,7 +10,11 @@ You should change it corresponding to functionality.
#define PAINTERMODULE_H
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include "extensionsystem/kplugin.h"
#include "paintermodulebase.h"
......
......@@ -2,7 +2,11 @@
#include "ui_painternewimagedialog.h"
#include "paintermodule.h"
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
namespace ActorPainter {
......
#ifndef PAINTERNEWIMAGEDIALOG_H
#define PAINTERNEWIMAGEDIALOG_H
#include <QtGlobal>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
namespace ActorPainter {
......
#ifndef PAINTERRULER_H
#define PAINTERRULER_H
#include <QtGlobal>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
namespace ActorPainter {
......
......@@ -2,7 +2,11 @@
#define PAINTERTOOLS_H
#include <QtCore>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
namespace ActorPainter {
......
#ifndef PAINTERVIEW_H
#define PAINTERVIEW_H
#include <QtGlobal>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
namespace ActorPainter {
......
#ifndef PAINTERWINDOW_H
#define PAINTERWINDOW_H
#include <QtGlobal>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
......
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtDeclarative REQUIRED)
find_package(PythonInterp 2.6 REQUIRED)
project(ActorRobot)
cmake_minimum_required(VERSION 2.8.3)
include (${QT_USE_FILE})
include(../../kumir2_plugin.cmake)
if(NOT DEFINED USE_QT)
set(USE_QT 4)
endif(NOT DEFINED USE_QT)
if(${USE_QT} GREATER 4)
# Find Qt5
find_package(Qt5 5.3.0 COMPONENTS Core Widgets Declarative REQUIRED)
include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Declarative_INCLUDE_DIRS} BEFORE)
set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Declarative_LIBRARIES})
set(MOC_PARAMS "-I${_qt5Core_install_prefix}/include/QtCore")
else()
# Find Qt4
set(QT_USE_QTMAIN 1)
find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtSvg QtDeclarative REQUIRED)
include(${QT_USE_FILE})
endif()
find_package(PythonInterp 2.6 REQUIRED)
include(../../kumir2_plugin.cmake)
set(SOURCES
robotmodule.cpp
......@@ -26,13 +41,13 @@ add_custom_target(ActorRobotPluginSpec ALL ${CMAKE_COMMAND} -E copy ${CMAKE_CURR
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/robotmodulebase.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/robotmodulebase.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/robotmodulebase.h
COMMAND ${QT_MOC_EXECUTABLE} ${MOC_PARAMS} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/robotmodulebase.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/robotmodulebase.h
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/robotmodulebase.h
)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/robotplugin.moc.cpp
COMMAND ${QT_MOC_EXECUTABLE} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/robotplugin.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/robotplugin.h
COMMAND ${QT_MOC_EXECUTABLE} ${MOC_PARAMS} -I${CMAKE_SOURCE_DIR}/src/shared -o${CMAKE_CURRENT_BINARY_DIR}/robotplugin.moc.cpp ${CMAKE_CURRENT_BINARY_DIR}/robotplugin.h
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/robotplugin.h
)
......@@ -46,7 +61,11 @@ set(MOC_SOURCES2
robotplugin.moc.cpp