Fixed build issues

CMakeLists.txt

@@ -12,6 +12,7 @@ option(LIMEREPORT_DEMO "Build LimeReport demos" OFF)
 option(ENABLE_DIALOG_DESIGNER "Enable dialog designer" OFF)
 option(HAVE_UI_LOADER "Enable ui loader" OFF)
 option(USE_QT6 "Use Qt6" OFF)
+option(UPDATE_TRANSLATIONS "Update TS files" OFF)
 
 if (ENABLE_DIALOG_DESIGNER AND NOT HAVE_UI_LOADER)
     message(FATAL_ERROR "You need to enable HAVE_UI_LOADER")
@@ -35,13 +36,9 @@ if(HAVE_UI_LOADER)
 
 if(ENABLE_DIALOG_DESIGNER)
     if(USE_QT6)
-        if(ENABLE_DIALOG_DESIGNER)
-            find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Designer DesignerComponentsPrivate REQUIRED)
-        endif()
+        find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Designer DesignerComponentsPrivate REQUIRED)
     else()
-        if(ENABLE_DIALOG_DESIGNER)
-             find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Designer DesignerComponents REQUIRED)
-         endif()
+        find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Designer DesignerComponents REQUIRED)
     endif(USE_QT6)
  endif()
 
@@ -397,7 +394,7 @@ set(GLOBAL_HEADERS
     ${PROJECT_NAME}/LRCallbackDS
     ${PROJECT_NAME}/LRDataManager
     ${PROJECT_NAME}/LRScriptManager
-    ${CMAKE_BINARY_DIR}/limereport/version.h
+    ${CMAKE_CURRENT_BINARY_DIR}/limereport/version.h
     )
 
 set(PROJECT_NAME ${PROJECT_NAME}-qt${QT_VERSION_MAJOR})
@@ -455,10 +452,15 @@ if(ENABLE_ZINT)
     target_link_libraries( ${PROJECT_NAME} PRIVATE QZint)
 endif(ENABLE_ZINT)
 
-target_compile_definitions( ${PROJECT_NAME} PRIVATE -DDEFAULT_ITEM_PADDING=${DEFAULT_ITEM_PADDING} -DHAVE_QT${QT_VERSION_MAJOR} -DHAVE_REPORT_DESIGNER -DUSE_QJSENGINE -D_CRT_SECURE_NO_WARNINGS)
+target_compile_definitions( ${PROJECT_NAME} PRIVATE
+    -DDEFAULT_ITEM_PADDING=${DEFAULT_ITEM_PADDING}
+    -DHAVE_QT${QT_VERSION_MAJOR}
+    -DHAVE_REPORT_DESIGNER
+    -DUSE_QJSENGINE
+    -D_CRT_SECURE_NO_WARNINGS)
 
 target_include_directories( ${PROJECT_NAME} PRIVATE
-        limereport/
+    limereport/
 	limereport/base
 	limereport/bands
 	limereport/databrowser
@@ -470,18 +472,81 @@ target_include_directories( ${PROJECT_NAME} PRIVATE
 	limereport/scripteditor )
 
 target_include_directories( ${PROJECT_NAME} PUBLIC
-    ${CMAKE_BINARY_DIR}/limereport )
+    ${CMAKE_CURRENT_BINARY_DIR}/limereport )
 
 target_include_directories( ${PROJECT_NAME} INTERFACE
         ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 list (APPEND GLOBAL_HEADERS ${EXTRA_FILES})
 set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER "${GLOBAL_HEADERS}")
 
+
+message(STATUS "${PROJECT_NAME} UPDATE_TRANSLATIONS: ${UPDATE_TRANSLATIONS}")
+list(APPEND LANGUAGES ru es fr pl zh ar)
+foreach(lang ${LANGUAGES})
+    list(APPEND TS_FILES translations/limereport_${lang}.ts)
+endforeach()
+
+if (${QT_VERSION} GREATER_EQUAL 6.7.0)
+
+    qt_add_lrelease(
+        TS_FILES ${TS_FILES}
+        EXCLUDE_FROM_ALL
+        LRELEASE_TARGET ${PROJECT_NAME}_lrelease
+        OPTIONS -removeidentical
+    )
+
+    if (UPDATE_TRANSLATIONS)
+        qt_add_lupdate(
+            TS_FILES ${TS_FILES}
+            SOURCES ${LIMEREPORT_SOURCES}
+            LUPDATE_TARGET ${PROJECT_NAME}_lupdate
+            OPTIONS -noobsolete
+        )
+        add_dependencies(${PROJECT_NAME}_lrelease ${PROJECT_NAME}_lupdate)
+    endif()
+
+elseif (${QT_VERSION} GREATER_EQUAL 6.2.0)
+
+    qt_add_lrelease(
+       ${PROJECT_NAME}
+       TS_FILES ${TS_FILES}
+       OPTIONS -removeidentical
+   )
+
+   if (UPDATE_TRANSLATIONS)
+        qt_add_lupdate(
+            ${PROJECT_NAME}
+            TS_FILES ${TS_FILES}
+            SOURCES ${LIMEREPORT_SOURCES}
+            OPTIONS -noobsolete
+        )
+        add_dependencies(${PROJECT_NAME}_lrelease ${PROJECT_NAME}_lupdate)
+    endif()
+
+else()
+
+    if (UPDATE_TRANSLATIONS)
+        qt5_create_translation(
+            QM_FILES
+            ${LIMEREPORT_SOURCES}
+            ${TS_FILES}
+            OPTIONS -noobsolete -locations relative
+        )
+    else()
+        qt5_add_translation(QM_FILES ${TS_FILES} OPTIONS -removeidentical)
+    endif()
+
+    add_custom_target(${PROJECT_NAME}_lrelease DEPENDS ${QM_FILES})
+
+endif()
+
+add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_lrelease)
+
+
 install(TARGETS
 	${PROJECT_NAME}
 	ARCHIVE DESTINATION lib
 	LIBRARY DESTINATION lib
 	RUNTIME DESTINATION bin
 	PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/limereport)
-

cmake/modules/GenerateVersionHeader.cmake

@@ -4,7 +4,7 @@ if(GIT_EXECUTABLE)
   # Generate a git-describe version string from Git repository tags
   execute_process(
     COMMAND ${GIT_EXECUTABLE} describe --tags --dirty
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     OUTPUT_VARIABLE GIT_DESCRIBE_VERSION
     RESULT_VARIABLE GIT_DESCRIBE_ERROR_CODE
     OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -22,7 +22,7 @@ if(NOT DEFINED GIT_VERSION)
 endif()
 
 configure_file(
-  ${CMAKE_SOURCE_DIR}/limereport/version.h.in
-  ${CMAKE_BINARY_DIR}/limereport/version.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/limereport/version.h.in
+  ${CMAKE_CURRENT_BINARY_DIR}/limereport/version.h
   @ONLY)
 

limereport/base/lrattribsabstractfactory.h

@@ -42,7 +42,7 @@ namespace LimeReport {
 
 template <typename AbstractProduct, typename IdentifierType, typename ProductCreator,
           typename Attribs>
-class AttribsAbstractFactory:
+class LIMEREPORT_EXPORT AttribsAbstractFactory:
     public Singleton<
         AttribsAbstractFactory<AbstractProduct, IdentifierType, ProductCreator, Attribs>> {
 private:
@@ -56,8 +56,11 @@ class AttribsAbstractFactory:
     {
         if (m_factoryMap.contains(id))
             return true;
-        return (m_factoryMap.insert(id, creator).value() == creator)
+        bool res = (m_factoryMap.insert(id, creator).value() == creator)
             && (m_attribsMap.insert(id, attribs).value() == attribs);
+        // if (res)
+        //     qDebug() << id  << "Registered";
+        return res;
     }
     bool unregisterCreator(const IdentifierType& id)
     {

limereport/dialogdesigner/3rdparty/qtcreator/designerintegrationv2/sizehandlerect.cpp

@@ -103,7 +103,7 @@ void SizeHandleRect::mousePressEvent(QMouseEvent *e)
         return;
 
     m_startSize = m_curSize = m_resizable->size();
-#if QT_VERSION < QT_VERSION_CHECK(5,15,3)
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
     m_startPos = m_curPos = m_resizable->mapFromGlobal(e->globalPos());
 #else
     m_startPos = m_curPos = m_resizable->mapFromGlobal(e->globalPosition());
@@ -121,7 +121,11 @@ void SizeHandleRect::mouseMoveEvent(QMouseEvent *e)
     // causes the handle and the mouse cursor to become out of sync
     // once a min/maxSize limit is hit. When the cursor reenters the valid
     // areas, it will now snap to it.
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     m_curPos = m_resizable->mapFromGlobal(e->globalPos());
+#else
+    m_curPos = m_resizable->mapFromGlobal(e->globalPosition());
+#endif
     QSize delta = QSize(m_curPos.x() - m_startPos.x(), m_curPos.y() -  m_startPos.y());
     switch (m_dir) {
     case Right:

limereport/items/lralignpropitem.h

@@ -39,7 +39,7 @@ typedef QMap<QString, Qt::Alignment> AlignMap;
 
 class AlignmentItemEditor;
 
-class AlignmentPropItem: public ObjectPropItem {
+class LIMEREPORT_EXPORT AlignmentPropItem: public ObjectPropItem {
     Q_OBJECT
 public:
     AlignmentPropItem(): ObjectPropItem(), m_horizEditor(NULL), m_vertEditor(NULL) { }

limereport/items/lrborderframeeditor.cpp

@@ -94,16 +94,24 @@ void BorderFrameEditor::unSetAllLines()
 
 void BorderFrameEditor::mousePressEvent(QMouseEvent* event)
 {
-    if (event->x() >= 10 && event->y() < 30)
+#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
+    int x = event->x();
+    int y = event->y();
+#else
+    int x = event->position().x();
+    int y = event->position().y();
+#endif
+
+    if (x >= 10 && y < 30)
         emit borderSideClicked(BaseDesignIntf::BorderSide::TopLine, !topLine);
 
-    if ((event->x() >= 10 && event->x() < 30) && (event->y() > 10))
+    if ((x >= 10 && x < 30) && (y > 10))
         emit borderSideClicked(BaseDesignIntf::BorderSide::LeftLine, !leftLine);
 
-    if (event->x() >= 10 && (event->y() > 80 && event->y() < rect().bottom()))
+    if (x >= 10 && (y > 80 && y < rect().bottom()))
         emit borderSideClicked(BaseDesignIntf::BorderSide::BottomLine, !bottomLine);
 
-    if ((event->x() >= 130 && event->x() < rect().width()) && event->y() > 10)
+    if ((x >= 130 && x < rect().width()) && y > 10)
         emit borderSideClicked(BaseDesignIntf::BorderSide::RightLine, !rightLine);
 }
 
@@ -172,6 +180,7 @@ QGraphicsLineItem* BorderFrameEditor::createSideLine(LimeReport::BaseDesignIntf:
         return scene->addLine(
             QLineF(10, rect().bottom() - 10, rect().width() - 10, rect().bottom() - 10), m_pen);
     }
+    return nullptr;
 }
 
 void BorderFrameEditor::updateBorders()

limereport/items/lrchartitem.cpp

@@ -770,26 +770,25 @@ QSizeF AbstractSeriesChart::calcChartLegendSize(const QFont& font, const qreal m
     }
     default: {
         qreal cw = 0;
-        qreal maxWidth = 0;
+        qreal mw = 0;
 
         if (m_chartItem->series().isEmpty()) {
             foreach (QString label, m_designLabels) {
                 cw += fm.height();
-                if (maxWidth < fm.boundingRect(label).width())
-                    maxWidth = fm.boundingRect(label).width() + 10;
+                if (mw < fm.boundingRect(label).width())
+                    mw = fm.boundingRect(label).width() + 10;
             }
         } else {
             foreach (SeriesItem* series, m_chartItem->series()) {
                 cw += fm.height();
-                if (maxWidth < fm.boundingRect(series->name()).width())
-                    maxWidth = fm.boundingRect(series->name()).width() + 10;
+                if (mw < fm.boundingRect(series->name()).width())
+                    mw = fm.boundingRect(series->name()).width() + 10;
             }
         }
         cw += fm.height();
-        return QSizeF(maxWidth + fm.height() * 2, cw);
+        return QSizeF(mw + fm.height() * 2, cw);
     }
     }
-    return QSizeF();
 }
 
 bool AbstractSeriesChart::verticalLabels(QPainter* painter, QRectF labelsRect)

limereport/items/lrtextitem.cpp

@@ -367,13 +367,13 @@ bool TextItem::isNeedExpandContent() const
 {
 #if (QT_VERSION < QT_VERSION_CHECK(5, 15, 1))
     QRegExp rx("$*\\{[^{]*\\}");
+    return content().contains(rx) || isContentBackedUp();
 #else
     bool result = false;
     QRegularExpression rx("\\$*\\{[^{]*\\}");
     result = content().contains(rx) || isContentBackedUp();
     return result;
 #endif
-    return content().contains(rx) || isContentBackedUp();
 }
 
 QString TextItem::replaceBR(QString text) const { return text.replace("<br/>", "\n"); }

limereport/lrbasedesignintf.cpp

@@ -1354,10 +1354,10 @@ void BaseDesignIntf::contextMenuEvent(QGraphicsSceneContextMenuEvent* event)
     pasteAction->setEnabled(false);
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-    lockGeometryAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_L));
-    copyAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_C));
-    cutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_X));
-    pasteAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_V));
+    lockGeometryAction->setShortcut(QKeySequence(Qt::Key(Qt::CTRL) | Qt::Key_L));
+    copyAction->setShortcut(QKeySequence(Qt::Key(Qt::CTRL) | Qt::Key_C));
+    cutAction->setShortcut(QKeySequence(Qt::Key(Qt::CTRL) | Qt::Key_X));
+    pasteAction->setShortcut(QKeySequence(Qt::Key(Qt::CTRL) | Qt::Key_V));
 #else
     lockGeometryAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L));
     copyAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_C));

limereport/lrdatasourcemanager.cpp

@@ -489,7 +489,6 @@ QString DataSourceManager::replaceVariables(QString value)
     }
     return value;
 #endif
-    return QString();
 }
 
 QString DataSourceManager::replaceVariables(QString query, QMap<QString, QString>& aliasesToParam)

limereport/lrdatasourcemanager.h

@@ -112,7 +112,7 @@ private slots:
     DataNode* m_rootNode;
 };
 
-class DataSourceManager:
+class LIMEREPORT_EXPORT DataSourceManager:
     public QObject,
     public ICollectionContainer,
     public IVariablesContainer,

limereport/lrdesignelementsfactory.h

@@ -50,7 +50,7 @@ struct ItemAttribs {
     }
 };
 
-class DesignElementsFactory:
+class LIMEREPORT_EXPORT DesignElementsFactory:
     public AttribsAbstractFactory<LimeReport::BaseDesignIntf, QString, CreateBand, ItemAttribs> {
 private:
     friend class Singleton<DesignElementsFactory>;

limereport/lritemdesignintf.h

@@ -36,7 +36,7 @@
 
 namespace LimeReport {
 class BaseDesignIntf;
-class ItemDesignIntf: public BaseDesignIntf {
+class LIMEREPORT_EXPORT ItemDesignIntf: public BaseDesignIntf {
     Q_OBJECT
     Q_PROPERTY(LocationType itemLocation READ itemLocation WRITE setItemLocation)
     Q_PROPERTY(bool stretchToMaxHeight READ stretchToMaxHeight WRITE setStretchToMaxHeight)
@@ -81,7 +81,7 @@ class Spacer: public ItemDesignIntf {
     }
 };
 
-class ContentItemDesignIntf: public ItemDesignIntf {
+class LIMEREPORT_EXPORT ContentItemDesignIntf: public ItemDesignIntf {
     Q_OBJECT
 public:
     ContentItemDesignIntf(const QString& xmlTypeName, QObject* owner = 0,

limereport/lritemscontainerdesignitf.cpp

@@ -55,16 +55,16 @@ void ItemsContainerDesignInft::snapshotItemsLayout(SnapshotType type)
 void ItemsContainerDesignInft::arrangeSubItems(RenderPass pass, DataSourceManager* dataManager,
                                                ArrangeType type)
 {
-    bool needArrage = (type == Force);
+    bool needArrange = (type == Force);
 
     foreach (PItemSortContainer item, m_containerItems) {
         if (item->m_item->isNeedUpdateSize(pass)) {
             item->m_item->updateItemSize(dataManager, pass);
-            needArrage = true;
+            needArrange = true;
         }
     }
 
-    if (needArrage) {
+    if (needArrange) {
         for (int i = 0; i < m_containerItems.count(); i++) {
             for (int j = i; j < m_containerItems.count(); j++) {
                 if ((i != j)
@@ -94,7 +94,7 @@ void ItemsContainerDesignInft::arrangeSubItems(RenderPass pass, DataSourceManage
         }
     }
 
-    if (needArrage || pass == FirstPass) {
+    if (needArrange || pass == FirstPass) {
         int maxBottom = findMaxBottom();
         foreach (BaseDesignIntf* item, childBaseItems()) {
             ItemDesignIntf* childItem = dynamic_cast<ItemDesignIntf*>(item);

limereport/lrpreviewreportwindow.cpp

@@ -465,7 +465,7 @@ void PreviewReportWindow::scaleComboboxChanged(QString text)
     if (m_scalePercentChanging)
         return;
     m_scalePercentChanging = true;
-    m_previewReportWidget->setScalePercent(text.remove(text.count() - 1, 1).toInt());
+    m_previewReportWidget->setScalePercent(text.remove(text.length() - 1, 1).toInt());
     m_scalePercentChanging = false;
 }