Issue #25: Remove pro/qbs, fix MSVC build

This commit is contained in:
Jakub Melka
2022-09-17 13:56:41 +02:00
parent 8ffc4f9189
commit 3b57f85d4d
66 changed files with 125 additions and 1931 deletions

View File

@@ -1,57 +0,0 @@
# Copyright (C) 2021 Jakub Melka
#
# This file is part of PDF4QT.
#
# PDF4QT is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# with the written consent of the copyright owner, any later version.
#
# PDF4QT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
TEMPLATE = lib
DEFINES += AUDIOBOOKPLUGIN_LIBRARY
QT += gui widgets
include(../../Pdf4Qt.pri)
LIBS += -L$$OUT_PWD/../..
LIBS += -lPdf4QtLib
win32-*g++: {
LIBS += -lole32 -lsapi
}
INCLUDEPATH += $$PWD/../../Pdf4QtLib/Sources
DESTDIR = $$OUT_PWD/../../pdfplugins
SOURCES += \
audiobookcreator.cpp \
audiobookplugin.cpp \
audiotextstreameditordockwidget.cpp
HEADERS += \
audiobookcreator.h \
audiobookplugin.h \
audiotextstreameditordockwidget.h
CONFIG += force_debug_info
DISTFILES += \
AudioBookPlugin.json
RESOURCES += \
icons.qrc
FORMS += \
audiotextstreameditordockwidget.ui

View File

@@ -1,15 +0,0 @@
import qbs
Pdf4QtPlugin {
name: "AudioBookPlugin"
files: [
"*.h",
"*.cpp",
"*.ui",
"icons.qrc",
]
Properties {
condition: qbs.hostOS.contains("windows")
cpp.defines: "AUDIOBOOKPLUGIN_LIBRARY"
}
}

View File

@@ -200,7 +200,7 @@ void AudioBookPlugin::drawPage(QPainter* painter,
QColor strokeColor = color;
QColor fillColor = color;
fillColor.setAlphaF(0.2);
fillColor.setAlphaF(0.2f);
pen.setColor(strokeColor);
painter->setPen(pen);

View File

@@ -1,52 +0,0 @@
# Copyright (C) 2020-2021 Jakub Melka
#
# This file is part of PDF4QT.
#
# PDF4QT is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# with the written consent of the copyright owner, any later version.
#
# PDF4QT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
TEMPLATE = lib
DEFINES += DIMENSIONPLUGIN_LIBRARY
QT += gui widgets
include(../../Pdf4Qt.pri)
LIBS += -L$$OUT_PWD/../..
LIBS += -lPdf4QtLib
INCLUDEPATH += $$PWD/../../Pdf4QtLib/Sources
DESTDIR = $$OUT_PWD/../../pdfplugins
SOURCES += \
dimensionsplugin.cpp \
dimensiontool.cpp \
settingsdialog.cpp
HEADERS += \
dimensionsplugin.h \
dimensiontool.h \
settingsdialog.h
CONFIG += force_debug_info
DISTFILES += \
DimensionsPlugin.json
RESOURCES += \
icons.qrc
FORMS += \
settingsdialog.ui

View File

@@ -1,15 +0,0 @@
import qbs
Pdf4QtPlugin {
name: "DimensionsPlugin"
files: [
"*.h",
"*.cpp",
"*.ui",
"icons.qrc",
]
Properties {
condition: qbs.hostOS.contains("windows")
cpp.defines: "DIMENSIONPLUGIN_LIBRARY"
}
}

View File

@@ -232,7 +232,7 @@ void DimensionsPlugin::drawPage(QPainter* painter,
pen.setCosmetic(true);
QColor brushColor = Qt::black;
brushColor.setAlphaF(0.1);
brushColor.setAlphaF(0.1f);
painter->setPen(qMove(pen));
painter->setBrush(QBrush(brushColor, isArea ? Qt::SolidPattern : Qt::DiagCrossPattern));

View File

@@ -1,65 +0,0 @@
# Copyright (C) 2021 Jakub Melka
#
# This file is part of PDF4QT.
#
# PDF4QT is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# with the written consent of the copyright owner, any later version.
#
# PDF4QT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
TEMPLATE = lib
DEFINES += OBJECTINSPECTORPLUGIN_LIBRARY
QT += gui widgets
include(../../Pdf4Qt.pri)
LIBS += -L$$OUT_PWD/../..
LIBS += -lPdf4QtLib
INCLUDEPATH += $$PWD/../../Pdf4QtLib/Sources
DESTDIR = $$OUT_PWD/../../pdfplugins
SOURCES += \
objectinspectordialog.cpp \
objectinspectorplugin.cpp \
objectstatisticsdialog.cpp \
objectviewerwidget.cpp \
pdfobjectinspectortreeitemmodel.cpp \
statisticsgraphwidget.cpp
HEADERS += \
objectinspectordialog.h \
objectinspectorplugin.h \
objectstatisticsdialog.h \
objectviewerwidget.h \
pdfobjectinspectortreeitemmodel.h \
statisticsgraphwidget.h
CONFIG += force_debug_info
DISTFILES += \
ObjectInspectorPlugin.json
RESOURCES += \
icons.qrc
FORMS += \
objectinspectordialog.ui \
objectstatisticsdialog.ui \
objectviewerwidget.ui \
statisticsgraphwidget.ui
win32-*g++|unix: {
LIBS += -ltbb
}

View File

@@ -88,7 +88,7 @@ StatisticsGraphWidget::GeometryHint StatisticsGraphWidget::getGeometryHint() con
for (const auto& item : m_statistics.items)
{
Q_ASSERT(item.texts.size() == hint.textWidths.size());
Q_ASSERT(static_cast<size_t>(item.texts.size()) == hint.textWidths.size());
for (int i = 0; i < item.texts.size(); ++i)
{
@@ -152,7 +152,7 @@ void StatisticsGraphWidget::paintEvent(QPaintEvent* event)
top = currentRect.bottom();
QColor color = (m_selectedColorBox == i) ? selectedColor: item.color;
color.setAlphaF(0.8);
color.setAlphaF(0.8f);
painter.fillRect(currentRect, color);
m_colorBoxes.push_back(currentRect);
}

View File

@@ -1,55 +0,0 @@
# Copyright (C) 2021 Jakub Melka
#
# This file is part of PDF4QT.
#
# PDF4QT is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# with the written consent of the copyright owner, any later version.
#
# PDF4QT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
TEMPLATE = lib
DEFINES += OUTPUTPREVIEWPLUGIN_LIBRARY
QT += gui widgets
include(../../Pdf4Qt.pri)
LIBS += -L$$OUT_PWD/../..
LIBS += -lPdf4QtLib
INCLUDEPATH += $$PWD/../../Pdf4QtLib/Sources
DESTDIR = $$OUT_PWD/../../pdfplugins
SOURCES += \
inkcoveragedialog.cpp \
outputpreviewdialog.cpp \
outputpreviewplugin.cpp \
outputpreviewwidget.cpp
HEADERS += \
inkcoveragedialog.h \
outputpreviewdialog.h \
outputpreviewplugin.h \
outputpreviewwidget.h
CONFIG += force_debug_info
DISTFILES += \
OutputPreviewPlugin.json
RESOURCES += \
icons.qrc
FORMS += \
inkcoveragedialog.ui \
outputpreviewdialog.ui

View File

@@ -1,16 +0,0 @@
import qbs
Pdf4QtPlugin {
name: "OutputPreviewPlugin"
files: [
"*.h",
"*.cpp",
"*.ui",
"icons.qrc",
]
cpp.includePaths: ["."]
Properties {
condition: qbs.hostOS.contains("windows")
cpp.defines: "OUTPUTPREVIEWPLUGIN_LIBRARY"
}
}

View File

@@ -1,30 +0,0 @@
# Copyright (C) 2020-2021 Jakub Melka
#
# This file is part of PDF4QT.
#
# PDF4QT is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# with the written consent of the copyright owner, any later version.
#
# PDF4QT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
TEMPLATE = subdirs
SUBDIRS += \
DimensionsPlugin \
SoftProofingPlugin \
RedactPlugin \
OutputPreviewPlugin \
ObjectInspectorPlugin \
AudioBookPlugin \
SignaturePlugin

View File

@@ -1,52 +0,0 @@
# Copyright (C) 2020-2021 Jakub Melka
#
# This file is part of PDF4QT.
#
# PDF4QT is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# with the written consent of the copyright owner, any later version.
#
# PDF4QT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
TEMPLATE = lib
DEFINES += REDACTPLUGIN_LIBRARY
QT += gui widgets
include(../../Pdf4Qt.pri)
LIBS += -L$$OUT_PWD/../..
LIBS += -lPdf4QtLib
INCLUDEPATH += $$PWD/../../Pdf4QtLib/Sources
DESTDIR = $$OUT_PWD/../../pdfplugins
SOURCES += \
createredacteddocumentdialog.cpp \
redactplugin.cpp
HEADERS += \
createredacteddocumentdialog.h \
redactplugin.h
CONFIG += force_debug_info
DISTFILES += \
RedactPlugin.json
RESOURCES += \
icons.qrc
FORMS += \
createredacteddocumentdialog.ui

View File

@@ -1,16 +0,0 @@
import qbs
Pdf4QtPlugin {
name: "RedactPlugin"
files: [
"*.h",
"*.cpp",
"*.ui",
"icons.qrc",
]
cpp.includePaths: ["."]
Properties {
condition: qbs.hostOS.contains("windows")
cpp.defines: "REDACTPLUGIN_LIBRARY"
}
}

View File

@@ -1,60 +0,0 @@
# Copyright (C) 2022 Jakub Melka
#
# This file is part of PDF4QT.
#
# PDF4QT is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# with the written consent of the copyright owner, any later version.
#
# PDF4QT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
TEMPLATE = lib
DEFINES += SIGNATUREPLUGIN_LIBRARY
QT += gui widgets
LIBS += -L$$OUT_PWD/../..
LIBS += -lPdf4QtLib
QMAKE_CXXFLAGS += /std:c++latest /utf-8
INCLUDEPATH += $$PWD/../../Pdf4QtLib/Sources
DESTDIR = $$OUT_PWD/../../pdfplugins
CONFIG += c++11
Pdf4Qt_OPENSSL_PATH = $$absolute_path(../../Tools, $$[QT_INSTALL_PREFIX])
# Link OpenSSL
LIBS += -L$$Pdf4Qt_OPENSSL_PATH/OpenSSL/Win_x64/bin -L$$Pdf4Qt_OPENSSL_PATH/OpenSSL/Win_x64/lib -llibcrypto -llibssl
INCLUDEPATH += $$Pdf4Qt_OPENSSL_PATH/OpenSSL/Win_x64/include
DEPENDPATH += $$Pdf4Qt_OPENSSL_PATH/OpenSSL/Win_x64/include
SOURCES += \
signatureplugin.cpp \
signdialog.cpp
HEADERS += \
signatureplugin.h \
signdialog.h
CONFIG += force_debug_info
DISTFILES += \
SignaturePlugin.json
RESOURCES += \
icons.qrc
FORMS += \
signdialog.ui

View File

@@ -1,15 +0,0 @@
import qbs
Pdf4QtPlugin {
name: "SignaturePlugin"
files: [
"*.h",
"*.cpp",
"*.ui",
"icons.qrc",
]
Properties {
condition: qbs.hostOS.contains("windows")
cpp.defines: "SIGNATUREPLUGIN_LIBRARY"
}
}

View File

@@ -1,50 +0,0 @@
# Copyright (C) 2020-2021 Jakub Melka
#
# This file is part of PDF4QT.
#
# PDF4QT is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# with the written consent of the copyright owner, any later version.
#
# PDF4QT is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public License
# along with PDF4QT. If not, see <https://www.gnu.org/licenses/>.
TEMPLATE = lib
DEFINES += SOFTPROOFINGPLUGIN_LIBRARY
QT += gui widgets
include(../../Pdf4Qt.pri)
LIBS += -L$$OUT_PWD/../..
LIBS += -lPdf4QtLib
INCLUDEPATH += $$PWD/../../Pdf4QtLib/Sources
DESTDIR = $$OUT_PWD/../../pdfplugins
SOURCES += \
softproofingplugin.cpp \
settingsdialog.cpp
HEADERS += \
softproofingplugin.h \
settingsdialog.h
CONFIG += force_debug_info
DISTFILES += \
SoftProofingPlugin.json
RESOURCES += \
icons.qrc
FORMS += \
settingsdialog.ui

View File

@@ -1,16 +0,0 @@
import qbs
Pdf4QtPlugin {
name: "SoftProofingPlugin"
files: [
"*.h",
"*.cpp",
"*.ui",
"icons.qrc",
]
cpp.includePaths: ["."]
Properties {
condition: qbs.hostOS.contains("windows")
cpp.defines: "SOFTPROOFINGPLUGIN_LIBRARY"
}
}