Changeset 98448 in webkit


Ignore:
Timestamp:
Oct 26, 2011 1:29:00 AM (13 years ago)
Author:
Simon Hausmann
Message:

[Qt][WK2] Remove QtWidgets dependency in MiniBrowser
​https://bugs.webkit.org/show_bug.cgi?id=70529

Remove obsolete code for a new QML based implementation
of MiniBrowser.
Change BrowserWindow to derive from QSGView instead of
QMainWindow. QSGView is used as a top level window that
provides the container for placing QML content.
Make MiniBrowserApplication derive from QGuiApplication
instead of QApplication.

Patch by Jocelyn Turcotte <​jocelyn.turcotte@nokia.com>,

Zeno Albisser <​zeno.albisser@nokia.com>

Patch by Zeno Albisser <​zeno.albisser@nokia.com> on 2011-10-25
Reviewed by Simon Hausmann.

  • MiniBrowser/qt/BrowserView.cpp: Removed.
  • MiniBrowser/qt/BrowserView.h: Removed.
  • MiniBrowser/qt/BrowserWindow.cpp:

(BrowserWindow::BrowserWindow):
(BrowserWindow::load):
(BrowserWindow::screenshot):
(BrowserWindow::loadURLListFromFile):
(BrowserWindow::updateUserAgentList):
(BrowserWindow::~BrowserWindow):

  • MiniBrowser/qt/BrowserWindow.h:
  • MiniBrowser/qt/MiniBrowser.pro:
  • MiniBrowser/qt/MiniBrowserApplication.cpp:

(MiniBrowserApplication::MiniBrowserApplication):
(MiniBrowserApplication::notify):

  • MiniBrowser/qt/MiniBrowserApplication.h:
  • MiniBrowser/qt/UrlLoader.cpp:

(UrlLoader::UrlLoader):

  • MiniBrowser/qt/main.cpp:
Location:
trunk/Tools
Files:
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r98447 r98448  
     12011-10-25  Zeno Albisser  <zeno.albisser@nokia.com>
     2
     3        [Qt][WK2] Remove QtWidgets dependency in MiniBrowser
     4        https://bugs.webkit.org/show_bug.cgi?id=70529
     5
     6        Remove obsolete code for a new QML based implementation
     7        of MiniBrowser.
     8        Change BrowserWindow to derive from QSGView instead of
     9        QMainWindow. QSGView is used as a top level window that
     10        provides the container for placing QML content.
     11        Make MiniBrowserApplication derive from QGuiApplication
     12        instead of QApplication.
     13
     14        Patch by Jocelyn Turcotte <jocelyn.turcotte@nokia.com>,
     15                 Zeno Albisser <zeno.albisser@nokia.com>
     16
     17        Reviewed by Simon Hausmann.
     18
     19        * MiniBrowser/qt/BrowserView.cpp: Removed.
     20        * MiniBrowser/qt/BrowserView.h: Removed.
     21        * MiniBrowser/qt/BrowserWindow.cpp:
     22        (BrowserWindow::BrowserWindow):
     23        (BrowserWindow::load):
     24        (BrowserWindow::screenshot):
     25        (BrowserWindow::loadURLListFromFile):
     26        (BrowserWindow::updateUserAgentList):
     27        (BrowserWindow::~BrowserWindow):
     28        * MiniBrowser/qt/BrowserWindow.h:
     29        * MiniBrowser/qt/MiniBrowser.pro:
     30        * MiniBrowser/qt/MiniBrowserApplication.cpp:
     31        (MiniBrowserApplication::MiniBrowserApplication):
     32        (MiniBrowserApplication::notify):
     33        * MiniBrowser/qt/MiniBrowserApplication.h:
     34        * MiniBrowser/qt/UrlLoader.cpp:
     35        (UrlLoader::UrlLoader):
     36        * MiniBrowser/qt/main.cpp:
     37
    1382011-10-25  Zeno Albisser  <zeno.albisser@nokia.com>
    239

  • trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp

    r98447 r98448  
    3434#include "qtouchwebpage.h"
    3535
    36 #if 0
    37 // FIXME
    38 static QWKPage* newPageFunction(QWKPage* page)
    39 {
    40     BrowserWindow* window = new BrowserWindow();
    41     return window->page();
    42 }
    43 #endif
    44 
    45 WindowWrapper::WindowWrapper(QWindow* window, QWidget* widget)
    46     : QWidget(widget)
    47     , m_window(window)
    48 {
    49     // Throttle resize events a bit
    50     m_resizeTimer.setInterval(16);
    51     m_resizeTimer.setSingleShot(true);
    52     connect(&m_resizeTimer, SIGNAL(timeout()), this, SLOT(doResize()));
    53     m_window->setWindowFlags(Qt::FramelessWindowHint);
    54 }
    55 
    56 void WindowWrapper::showEvent(QShowEvent* event)
    57 {
    58     QWidget::showEvent(event);
    59     m_window->setParent(window()->windowHandle());
    60     m_window->show();
    61 }
    62 
    63 void WindowWrapper::resizeEvent(QResizeEvent* event)
    64 {
    65     QWidget::resizeEvent(event);
    66     if (!m_resizeTimer.isActive())
    67         m_resizeTimer.start();
    68 }
    69 
    70 void WindowWrapper::doResize()
    71 {
    72     m_window->setGeometry(QRect(mapTo(window(), QPoint(0, 0)), size()));
    73 }
    7436
    7537BrowserWindow::BrowserWindow(WindowOptions* options)
    7638    : m_urlLoader(0)
    77     , m_browser(0)
    7839{
    7940    if (options)
    … …  
    8445    }
    8546
    86     m_browser = new BrowserView(m_windowOptions.useTouchWebView);
    87 
    88     setAttribute(Qt::WA_DeleteOnClose);
    89 
    90     connect(webView(), SIGNAL(loadProgressChanged(int)), SLOT(onLoadProgressChanged(int)));
    91     connect(webView(), SIGNAL(titleChanged(QString)), SLOT(setWindowTitle(QString)));
    92     connect(webView(), SIGNAL(urlChanged(QUrl)), SLOT(urlChanged(QUrl)));
    93 
    94     if (m_windowOptions.printLoadedUrls)
    95         connect(webView(), SIGNAL(urlChanged(QUrl)), this, SLOT(printURL(QUrl)));
    96 
    97     if (QDesktopWebView* const desktopWebView = m_browser->desktopWebView()) {
    98         connect(desktopWebView, SIGNAL(statusBarMessageChanged(QString)), statusBar(), SLOT(showMessage(QString)));
    99         connect(desktopWebView, SIGNAL(linkHovered(QUrl, QString)), this, SLOT(onLinkHovered(QUrl, QString)));
    100     }
    101 
    102     setCentralWidget(new WindowWrapper(m_browser, this));
    103     centralWidget()->setFocus(Qt::OtherFocusReason);
    104 
    105     QMenu* fileMenu = menuBar()->addMenu("&File");
    106     fileMenu->addAction("New Window", this, SLOT(newWindow()), QKeySequence::New);
    107     fileMenu->addAction("Open File", this, SLOT(openFile()), QKeySequence::Open);
    108     fileMenu->addSeparator();
    109     fileMenu->addAction("Quit", this, SLOT(close()));
    110 
    111 #if 0
    112     QMenu* editMenu = menuBar()->addMenu("&Edit");
    113     QAction* undo = page()->action(QWKPage::Undo);
    114     undo->setShortcut(QKeySequence(QKeySequence::Undo));
    115     editMenu->addAction(undo);
    116     QAction* redo = page()->action(QWKPage::Redo);
    117     redo->setShortcut(QKeySequence(QKeySequence::Redo));
    118     editMenu->addAction(redo);
    119     editMenu->addSeparator();
    120 
    121     QMenu* viewMenu = menuBar()->addMenu("&View");
    122     viewMenu->addAction(page()->action(QWKPage::Stop));
    123     viewMenu->addAction(page()->action(QWKPage::Reload));
    124     viewMenu->addSeparator();
    125     viewMenu->addAction("Take Screen Shot...", this, SLOT(screenshot()));
    126 #endif
    127 
    128     QMenu* windowMenu = menuBar()->addMenu("&Window");
    129     QAction* toggleFullScreen = windowMenu->addAction("Toggle FullScreen", this, SIGNAL(enteredFullScreenMode(bool)));
    130     toggleFullScreen->setShortcut(Qt::Key_F11);
    131     toggleFullScreen->setCheckable(true);
    132     toggleFullScreen->setChecked(false);
    133     // When exit fullscreen mode by clicking on the exit area (bottom right corner) we must
    134     // uncheck the Toggle FullScreen action.
    135     toggleFullScreen->connect(this, SIGNAL(enteredFullScreenMode(bool)), SLOT(setChecked(bool)));
    136     connect(this, SIGNAL(enteredFullScreenMode(bool)), this, SLOT(toggleFullScreenMode(bool)));
    137 
    138     QMenu* toolsMenu = menuBar()->addMenu("&Develop");
    139     toolsMenu->addAction("Change User Agent", this, SLOT(showUserAgentDialog()));
    140     toolsMenu->addSeparator();
    141     toolsMenu->addAction("Load URLs from file", this, SLOT(loadURLListFromFile()));
    142 
    143     m_addressBar = new QLineEdit();
    144     connect(m_addressBar, SIGNAL(returnPressed()), SLOT(changeLocation()));
    145 
    146     QShortcut* selectAddressBar = new QShortcut(Qt::CTRL | Qt::Key_L, this);
    147     connect(selectAddressBar, SIGNAL(activated()), this, SLOT(openLocation()));
    148 
    149 #if 0
    150     // FIXME
    151     page()->setCreateNewPageFunction(newPageFunction);
    152 #endif
    153 
    15447    if (m_windowOptions.startMaximized)
    155         setWindowState(windowState() | Qt::WindowMaximized);
     48        setWindowState(Qt::WindowMaximized);
    15649    else
    15750        resize(800, 600);
    … …  
    16154void BrowserWindow::load(const QString& url)
    16255{
    163     m_addressBar->setText(url);
    164     m_browser->load(url);
    165 }
    166 
    167 QObject* BrowserWindow::webView() const
    168 {
    169     return m_browser->touchWebView() ? static_cast<QObject*>(m_browser->touchWebView()->page()) : static_cast<QObject*>(m_browser->desktopWebView());
    17056}
    17157
    … …  
    17763}
    17864
    179 void BrowserWindow::openLocation()
    180 {
    181     m_addressBar->selectAll();
    182     m_addressBar->setFocus();
    183 }
    184 
    185 void BrowserWindow::changeLocation()
    186 {
    187     QString string = m_addressBar->text();
    188     m_browser->load(string);
    189 }
    190 
    191 void BrowserWindow::onLoadProgressChanged(int progress)
    192 {
    193     QColor backgroundColor = QApplication::palette().color(QPalette::Base);
    194     QColor progressColor = QColor(120, 180, 240);
    195     QPalette pallete = m_addressBar->palette();
    196 
    197     if (progress <= 0 || progress >= 100)
    198         pallete.setBrush(QPalette::Base, backgroundColor);
    199     else {
    200         QLinearGradient gradient(0, 0, width(), 0);
    201         gradient.setColorAt(0, progressColor);
    202         gradient.setColorAt(((double) progress) / 100, progressColor);
    203         if (progress != 100)
    204             gradient.setColorAt((double) progress / 100 + 0.001, backgroundColor);
    205         pallete.setBrush(QPalette::Base, gradient);
    206     }
    207     m_addressBar->setPalette(pallete);
    208 }
    209 
    210 void BrowserWindow::urlChanged(const QUrl& url)
    211 {
    212     m_addressBar->setText(url.toString());
    213     m_browser->requestActivateWindow();
    214     m_browser->view()->setFocus(true);
    215 }
    216 
    217 void BrowserWindow::openFile()
    218 {
    219     static const QString filter("HTML Files (*.htm *.html *.xhtml);;Text Files (*.txt);;Image Files (*.gif *.jpg *.png);;SVG Files (*.svg);;All Files (*)");
    220 
    221     QFileDialog fileDialog(this, tr("Open"), QString(), filter);
    222     fileDialog.setAcceptMode(QFileDialog::AcceptOpen);
    223     fileDialog.setFileMode(QFileDialog::ExistingFile);
    224     fileDialog.setOptions(QFileDialog::ReadOnly);
    225 
    226     if (fileDialog.exec()) {
    227         QString selectedFile = fileDialog.selectedFiles()[0];
    228         if (!selectedFile.isEmpty())
    229             load(selectedFile);
    230     }
    231 }
    232 
    23365void BrowserWindow::screenshot()
    23466{
    235     QPixmap pixmap = QPixmap::grabWidget(m_browser);
    236     QLabel* label = 0;
    237     label = new QLabel;
    238     label->setAttribute(Qt::WA_DeleteOnClose);
    239     label->setWindowTitle("Screenshot - Preview");
    240     label->setPixmap(pixmap);
    241     label->show();
    242 
    243     QString fileName = QFileDialog::getSaveFileName(label, "Screenshot", QString(), QString("PNG File (.png)"));
    244     if (!fileName.isEmpty()) {
    245         QRegExp rx("*.png");
    246         rx.setCaseSensitivity(Qt::CaseInsensitive);
    247         rx.setPatternSyntax(QRegExp::Wildcard);
    248 
    249         if (!rx.exactMatch(fileName))
    250             fileName += ".png";
    251 
    252         pixmap.save(fileName, "png");
    253         if (label)
    254             label->setWindowTitle(QString("Screenshot - Saved at %1").arg(fileName));
    255     }
    256 }
    257 
    258 void BrowserWindow::toggleFullScreenMode(bool enable)
    259 {
    260     bool alreadyEnabled = windowState() & Qt::WindowFullScreen;
    261     if (enable ^ alreadyEnabled)
    262         setWindowState(windowState() ^ Qt::WindowFullScreen);
    263 }
    264 
    265 void BrowserWindow::showUserAgentDialog()
    266 {
    267 #if 0
    268     // FIXME
    269     updateUserAgentList();
    270 
    271     QDialog dialog(this);
    272     dialog.setWindowTitle("Change User Agent");
    273     dialog.resize(size().width() * 0.7, dialog.size().height());
    274     QVBoxLayout* layout = new QVBoxLayout(&dialog);
    275     dialog.setLayout(layout);
    276 
    277     QComboBox* combo = new QComboBox(&dialog);
    278     combo->setSizeAdjustPolicy(QComboBox::AdjustToMinimumContentsLength);
    279     combo->setEditable(true);
    280     combo->insertItems(0, m_userAgentList);
    281     layout->addWidget(combo);
    282 
    283     int index = combo->findText(page()->customUserAgent());
    284     combo->setCurrentIndex(index);
    285 
    286     QDialogButtonBox* buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel
    287                                                       , Qt::Horizontal, &dialog);
    288     connect(buttonBox, SIGNAL(accepted()), &dialog, SLOT(accept()));
    289     connect(buttonBox, SIGNAL(rejected()), &dialog, SLOT(reject()));
    290     layout->addWidget(buttonBox);
    291 
    292     if (dialog.exec() && !combo->currentText().isEmpty())
    293         page()->setCustomUserAgent(combo->currentText());
    294 #endif
    29567}
    29668
    29769void BrowserWindow::loadURLListFromFile()
    29870{
    299     QString selectedFile;
    300     selectedFile = QFileDialog::getOpenFileName(this, tr("Load URL list from file")
    301                                                        , QString(), tr("Text Files (*.txt);;All Files (*)"));
    302     if (selectedFile.isEmpty())
    303        return;
    304 
    305     m_urlLoader = new UrlLoader(this, selectedFile, 0, 0);
    306     m_urlLoader->loadNext();
    307 }
    308 
    309 void BrowserWindow::printURL(const QUrl& url)
    310 {
    311     QTextStream output(stdout);
    312     output << "Loaded: " << url.toString() << endl;
    313 }
    314 
    315 void BrowserWindow::onLinkHovered(const QUrl& url, const QString&)
    316 {
    317     statusBar()->showMessage(url.toString());
    31871}
    31972
    32073void BrowserWindow::updateUserAgentList()
    32174{
    322 #if 0
    323     // FIXME
    324     QFile file(":/useragentlist.txt");
    325 
    326     if (file.open(QIODevice::ReadOnly)) {
    327         while (!file.atEnd()) {
    328             QString agent = file.readLine().trimmed();
    329             if (!m_userAgentList.contains(agent))
    330                 m_userAgentList << agent;
    331         }
    332         file.close();
    333     }
    334 
    335     Q_ASSERT(!m_userAgentList.isEmpty());
    336     QWKPage* wkPage = page();
    337     if (!(wkPage->customUserAgent().isEmpty() || m_userAgentList.contains(wkPage->customUserAgent())))
    338         m_userAgentList << wkPage->customUserAgent();
    339 #endif
    34075}
    34176
    … …  
    34378{
    34479    delete m_urlLoader;
    345     delete m_addressBar;
    34680}

  • trunk/Tools/MiniBrowser/qt/BrowserWindow.h

    r96345 r98448  
    3030#define BrowserWindow_h
    3131
    32 #include "BrowserView.h"
    33 
    3432#include "MiniBrowserApplication.h"
    3533#include <QStringList>
    3634#include <QTimer>
     35#include <QtDeclarative/QSGView>
    3736
    3837class UrlLoader;
    3938
    40 class WindowWrapper : public QWidget
    41 {
    42     Q_OBJECT
    43 
    44 public:
    45     WindowWrapper(QWindow* window, QWidget* widget = 0);
    46 
    47 protected:
    48     void showEvent(QShowEvent* event);
    49     void resizeEvent(QResizeEvent* event);
    50 
    51 private slots:
    52     void doResize();
    53 
    54 private:
    55     QWindow* m_window;
    56     QTimer m_resizeTimer;
    57 };
    58 
    59 class BrowserWindow : public QMainWindow {
     39class BrowserWindow : public QSGView {
    6040    Q_OBJECT
    6141
    … …  
    6444    ~BrowserWindow();
    6545    void load(const QString& url);
    66 
    6746    QObject* webView() const;
    6847
    6948public slots:
    7049    BrowserWindow* newWindow(const QString& url = "about:blank");
    71     void openLocation();
    72 
    73 signals:
    74     void enteredFullScreenMode(bool on);
    7550
    7651protected slots:
    77     void changeLocation();
    78     void onLoadProgressChanged(int progress);
    79     void urlChanged(const QUrl&);
    80     void openFile();
    81 
    8252    void screenshot();
    8353
    84     void toggleFullScreenMode(bool enable);
    85 
    86     void showUserAgentDialog();
    87 
    8854    void loadURLListFromFile();
    89 
    90     void printURL(const QUrl&);
    91     void onLinkHovered(const QUrl&, const QString&);
    9255
    9356private:
    … …  
    9659    UrlLoader* m_urlLoader;
    9760    WindowOptions m_windowOptions;
    98     BrowserView* m_browser;
    99     QLineEdit* m_addressBar;
    10061    QStringList m_userAgentList;
    10162};

  • trunk/Tools/MiniBrowser/qt/MiniBrowser.pro

    r97139 r98448  
    33
    44SOURCES += \
    5     BrowserView.cpp \
    65    BrowserWindow.cpp \
    76    main.cpp \
    … …  
    1110
    1211HEADERS += \
    13     BrowserView.h \
    1412    BrowserWindow.h \
    1513    MiniBrowserApplication.h \
    … …  
    3331QT += network declarative
    3432macx:QT+=xml
    35 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    3633
    3734linux-* {
    … …  
    4845}
    4946
    50 contains(QT_CONFIG, opengl) {
    51     QT += opengl
    52     DEFINES += QT_CONFIGURED_WITH_OPENGL
    53 }
    54 
    5547DEFINES -= QT_ASCII_CAST_WARNINGS
    5648

  • trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp

    r96931 r98448  
    6262
    6363MiniBrowserApplication::MiniBrowserApplication(int& argc, char** argv)
    64     : QApplication(argc, argv, QApplication::GuiServer)
     64    : QGuiApplication(argc, argv)
    6565    , m_windowOptions()
    6666    , m_realTouchEventReceived(false)
    … …  
    8383
    8484    if (!event->spontaneous() || m_realTouchEventReceived)
    85         return QApplication::notify(target, event);
     85        return QGuiApplication::notify(target, event);
    8686
    8787    if (isTouchEvent(event) && static_cast<QTouchEvent*>(event)->deviceType() == QTouchEvent::TouchScreen) {
    … …  
    9090        else
    9191            m_realTouchEventReceived = true;
    92         return QApplication::notify(target, event);
     92        return QGuiApplication::notify(target, event);
    9393    }
    9494
    … …  
    112112        case QEvent::MouseMove:
    113113            if (!mouseEvent->buttons() || !m_touchPoints.contains(mouseEvent->buttons()))
    114                 return QApplication::notify(target, event);
     114                return QGuiApplication::notify(target, event);
    115115            touchPoint.state = Qt::TouchPointMoved;
    116116            touchPoint.id = mouseEvent->buttons();
    … …  
    118118        case QEvent::MouseButtonRelease:
    119119            if (mouseEvent->modifiers().testFlag(Qt::ControlModifier))
    120                 return QApplication::notify(target, event);
     120                return QGuiApplication::notify(target, event);
    121121            touchPoint.state = Qt::TouchPointReleased;
    122122            touchPoint.id = mouseEvent->button();
    … …  
    149149        case Qt::TouchPointStationary:
    150150            // Don't send the event if nothing changed.
    151             return QApplication::notify(target, event);
     151            return QGuiApplication::notify(target, event);
    152152        default:
    153153            eventType = QEvent::TouchUpdate;
    … …  
    163163                m_touchPoints.remove(touchPoint.id);
    164164        }
    165         return true;
    166     }
    167 
    168     return QApplication::notify(target, event);
     165    }
     166
     167    return QGuiApplication::notify(target, event);
    169168}
    170169
    … …  
    184183             << "[-robot-timeout seconds]"
    185184             << "[-robot-extra-time seconds]"
    186              << "[-chunked-drawing-area]"
    187185             << "[-print-loaded-urls]"
    188 #if defined(QT_CONFIGURED_WITH_OPENGL)
    189              << "[-gl-viewport]"
    190 #endif
    191186             << "URLs";
    192187        appQuit(0);
    … …  
    225220        m_windowOptions.printLoadedUrls = true;
    226221
    227 #if defined(QT_CONFIGURED_WITH_OPENGL)
    228     if (args.contains("-gl-viewport"))
    229         m_windowOptions.useQGLWidgetViewport = true;
    230 #endif
    231 }
     222}

  • trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h

    r96931 r98448  
    3030#define MiniBrowserApplication_h
    3131
    32 #include <QApplication>
    33 #include <QFileDialog>
    3432#include <QHash>
    35 #include <QLabel>
    36 #include <QLineEdit>
    37 #include <QMainWindow>
    38 #include <QMenu>
    39 #include <QMenuBar>
    40 #include <QShortcut>
    41 #include <QStatusBar>
    4233#include <QStringList>
    43 #include <QToolBar>
     34#include <QtDeclarative>
     35#include <QtGui/QGuiApplication>
    4436#include <QTouchEvent>
    4537#include <QUrl>
    … …  
    6052    bool useTouchWebView;
    6153    bool startMaximized;
    62 #if defined(QT_CONFIGURED_WITH_OPENGL)
    63     bool useQGLWidgetViewport;
    64 #endif
    6554};
    6655
    67 class MiniBrowserApplication : public QApplication {
     56class MiniBrowserApplication : public QGuiApplication {
    6857    Q_OBJECT
    6958

  • trunk/Tools/MiniBrowser/qt/UrlLoader.cpp

    r90458 r98448  
    4242    connect(&m_checkIfFinishedTimer, SIGNAL(timeout()), this, SLOT(checkIfFinished()));
    4343    // loadStarted and loadFinished on QWebPage is emitted for each frame/sub-frame
    44     connect(m_browserWindow->webView(), SIGNAL(loadStarted()), this, SLOT(frameLoadStarted()));
    45     connect(m_browserWindow->webView(), SIGNAL(loadFinished(bool)), this, SLOT(frameLoadFinished()));
     44
     45    // FIXME: Reconnect these signals after Qt5/QtQuick rewrite if necessary.
     46    // connect(m_browserWindow->webView(), SIGNAL(loadStarted()), this, SLOT(frameLoadStarted()));
     47    // connect(m_browserWindow->webView(), SIGNAL(loadFinished(bool)), this, SLOT(frameLoadFinished()));
    4648
    4749    if (timeoutSeconds) {
    4850        m_timeoutTimer.setInterval(timeoutSeconds * 1000);
    4951        m_timeoutTimer.setSingleShot(true);
    50         connect(m_browserWindow->webView(), SIGNAL(loadStarted()), &m_timeoutTimer, SLOT(start()));
     52        // FIXME: Reconnect this signal after Qt5/QtQuick rewrite if necessary.
     53        // connect(m_browserWindow->webView(), SIGNAL(loadStarted()), &m_timeoutTimer, SLOT(start()));
    5154        connect(&m_timeoutTimer, SIGNAL(timeout()), this, SLOT(loadNext()));
    5255    }

  • trunk/Tools/MiniBrowser/qt/main.cpp

    r96345 r98448  
    3131#include "MiniBrowserApplication.h"
    3232#include "UrlLoader.h"
     33#include <QDir>
    3334#include <QLatin1String>
    3435#include <QRegExp>
Note: See TracChangeset for help on using the changeset viewer.