Skip to content

Commit

Permalink
ifdef Qt5.10+ stuff for Linux and tweak Inno setup script
Browse files Browse the repository at this point in the history
  • Loading branch information
dougmassay committed Jun 22, 2019
1 parent b9be2d4 commit e46ef58
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions installer/Sigil.iss
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ AppName=Sigil
AppVerName=Sigil ${SIGIL_FULL_VERSION}
VersionInfoVersion=${SIGIL_FULL_VERSION}
DefaultDirName={pf}\Sigil
DisableDirPage=no
DefaultGroupName=Sigil
UninstallDisplayIcon={app}\Sigil.exe
AppPublisher=Sigil-Ebook
Expand Down
2 changes: 2 additions & 0 deletions src/Dialogs/SelectFiles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ SelectFiles::SelectFiles(QString title, QList<Resource *> media_resources, QStri
m_WebView->setContextMenuPolicy(Qt::NoContextMenu);
m_WebView->setFocusPolicy(Qt::NoFocus);
m_WebView->setAcceptDrops(false);
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
m_WebView->page()->settings()->setAttribute(QWebEngineSettings::ShowScrollBars,false);
#endif
ui.avLayout->addWidget(m_WebView);

ReadSettings();
Expand Down
2 changes: 2 additions & 0 deletions src/Dialogs/ViewImage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ ViewImage::ViewImage(QWidget *parent)
ui.webView->setContextMenuPolicy(Qt::NoContextMenu);
ui.webView->setFocusPolicy(Qt::NoFocus);
ui.webView->setAcceptDrops(false);
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
ui.webView->page()->settings()->setAttribute(QWebEngineSettings::ShowScrollBars,false);
#endif

ReadSettings();
}
Expand Down

0 comments on commit e46ef58

Please sign in to comment.