From 8d7ee9b76a356534893c2f1e3b63bf010bf61d28 Mon Sep 17 00:00:00 2001 From: Jakub Melka Date: Sat, 7 Nov 2020 14:42:24 +0100 Subject: [PATCH] FreeType as static library --- PdfForQtLib/PdfForQtLib.pro | 15 +++++---------- PdfForQtViewer/pdfviewermainwindow.cpp | 6 ------ PdfForQtViewer/pdfviewermainwindow.h | 1 - 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/PdfForQtLib/PdfForQtLib.pro b/PdfForQtLib/PdfForQtLib.pro index 28fbedd..66ec346 100644 --- a/PdfForQtLib/PdfForQtLib.pro +++ b/PdfForQtLib/PdfForQtLib.pro @@ -168,16 +168,15 @@ FORMS += \ PDFFORQT_DEPENDENCIES_PATH = K:\Programming\PDF\PDF_For_Qt\PDfForQt-Dependencies PDFFORQT_OPENSSL_PATH = K:\Programming\Qt\Tools\ +CONFIG(debug, debug|release) { +SUFFIX = d +} + # Link to freetype library -LIBS += -L$$PDFFORQT_DEPENDENCIES_PATH/FreeType/ -lfreetype +LIBS += -L$$PDFFORQT_DEPENDENCIES_PATH/FreeType/ -lfreetype$${SUFFIX} INCLUDEPATH += $$PDFFORQT_DEPENDENCIES_PATH/FreeType/include DEPENDPATH += $$PDFFORQT_DEPENDENCIES_PATH/FreeType/include -# Add freetype to installations -freetype_lib.files = $$PDFFORQT_DEPENDENCIES_PATH/FreeType/freetype.dll -freetype_lib.path = $$DESTDIR/install -INSTALLS += freetype_lib - # Link to OpenJPEG library LIBS += -L$$PDFFORQT_DEPENDENCIES_PATH/OpenJPEG/lib/ -lopenjp2 INCLUDEPATH += $$PDFFORQT_DEPENDENCIES_PATH/OpenJPEG/include/openjpeg-2.3 @@ -252,10 +251,6 @@ pdfforqt_library.path = $$DESTDIR/install INSTALLS += pdfforqt_library -CONFIG(debug, debug|release) { -SUFFIX = d -} - qt_libraries.files = $$[QT_INSTALL_BINS]/Qt?Widgets$${SUFFIX}.dll \ $$[QT_INSTALL_BINS]/Qt?Gui$${SUFFIX}.dll \ $$[QT_INSTALL_BINS]/Qt?Core$${SUFFIX}.dll \ diff --git a/PdfForQtViewer/pdfviewermainwindow.cpp b/PdfForQtViewer/pdfviewermainwindow.cpp index e7928d6..785335b 100644 --- a/PdfForQtViewer/pdfviewermainwindow.cpp +++ b/PdfForQtViewer/pdfviewermainwindow.cpp @@ -1524,11 +1524,6 @@ void PDFViewerMainWindow::dragMoveEvent(QDragMoveEvent* event) } } -void PDFViewerMainWindow::dragLeaveEvent(QDragLeaveEvent* event) -{ - -} - void PDFViewerMainWindow::dropEvent(QDropEvent* event) { if (event->mimeData()->hasUrls()) @@ -1542,5 +1537,4 @@ void PDFViewerMainWindow::dropEvent(QDropEvent* event) } } - } // namespace pdfviewer diff --git a/PdfForQtViewer/pdfviewermainwindow.h b/PdfForQtViewer/pdfviewermainwindow.h index 5390c7a..de8af85 100644 --- a/PdfForQtViewer/pdfviewermainwindow.h +++ b/PdfForQtViewer/pdfviewermainwindow.h @@ -82,7 +82,6 @@ signals: protected: virtual void dragEnterEvent(QDragEnterEvent* event) override; virtual void dragMoveEvent(QDragMoveEvent* event) override; - virtual void dragLeaveEvent(QDragLeaveEvent* event) override; virtual void dropEvent(QDropEvent* event) override; private slots: