Fixed crash on start on Mac. Closes #225

remotes/origin/falkon
nowrep 14 years ago
parent 6530351afc
commit 69416114dd
  1. 2
      src/navigation/navigationbar.cpp
  2. 3
      src/webview/webview.cpp

@ -125,7 +125,9 @@ NavigationBar::NavigationBar(QupZilla* mainClass, QWidget* parent)
m_layout->addWidget(m_buttonHome);
m_layout->addWidget(m_buttonAddTab);
m_layout->addWidget(m_navigationSplitter);
#ifndef Q_WS_MAC
m_layout->addWidget(m_supMenu);
#endif
m_layout->addWidget(m_exitFullscreen);
connect(m_menuBack, SIGNAL(aboutToShow()), this, SLOT(aboutToShowHistoryBackMenu()));

@ -774,7 +774,6 @@ void WebView::mousePressEvent(QMouseEvent* event)
break;
case Qt::MiddleButton: {
qDebug("Middle mouse press");
QWebFrame* frame = page()->frameAt(event->pos());
#ifdef Q_WS_WIN
if (frame && frame->hitTestContent(event->pos()).linkUrl().isEmpty()) {
@ -795,7 +794,6 @@ void WebView::mousePressEvent(QMouseEvent* event)
}
case Qt::LeftButton: {
qDebug("Left mouse press");
QWebFrame* frame = page()->frameAt(event->pos());
if (frame) {
QUrl link = frame->hitTestContent(event->pos()).linkUrl();
@ -818,7 +816,6 @@ void WebView::mouseReleaseEvent(QMouseEvent* event)
{
switch (event->button()) {
case Qt::MiddleButton: {
qDebug("Middle release");
QWebFrame* frame = page()->frameAt(event->pos());
if (frame) {
QUrl link = frame->hitTestContent(event->pos()).linkUrl();

Loading…
Cancel
Save