cmake plugin cleanups

This commit is contained in:
Daniel Brunner
2018-10-14 15:34:55 +02:00
parent 91f5f719e4
commit 899410387f
2 changed files with 10 additions and 4 deletions

View File

@@ -28,7 +28,13 @@ set(FORMS
dialogs/timeassignmentdialog.ui
)
add_library(zeiterfassung-plugins-advancedviewplugin SHARED ${HEADERS} ${SOURCES} ${RESOURCES} ${FORMS})
set(OTHER_FILES
advancedviewplugin.json
)
add_library(zeiterfassung-plugins-advancedviewplugin SHARED ${HEADERS} ${SOURCES} ${RESOURCES} ${FORMS} ${OTHER_FILES})
set_target_properties(zeiterfassung-plugins-advancedviewplugin PROPERTIES OUTPUT_NAME advancedviewplugin PREFIX "")
target_link_libraries(zeiterfassung-plugins-advancedviewplugin Qt5::Core Qt5::Gui Qt5::Widgets zeiterfassungguilib zeiterfassungnetworklib)

View File

@@ -6,6 +6,8 @@
#include <QLocale>
#include <QBoxLayout>
#include "utils/fileutils.h"
#include "mainwindow.h"
#include "stripswidget.h"
@@ -16,9 +18,7 @@ AdvancedViewPlugin::AdvancedViewPlugin(QObject *parent) :
{
qDebug() << "called";
static auto dir = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath(QStringLiteral("translations"));
if(m_translator.load(QLocale(), QStringLiteral("advancedviewplugin"), QStringLiteral("_"), dir))
if(m_translator.load(QLocale(), QStringLiteral("advancedviewplugin"), QStringLiteral("_"), translationsDir()))
{
if(!QCoreApplication::installTranslator(&m_translator))
{