mirror of https://github.com/JakubMelka/PDF4QT.git
FreeType as static library
This commit is contained in:
parent
8d9b9cb493
commit
8d7ee9b76a
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in New Issue