From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 5 May 2011 14:36:32 +0100
Subject: Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
---
 WebKitTools/WebKitTestRunner/qt/main.cpp | 69 --------------------------------
 1 file changed, 69 deletions(-)
 delete mode 100644 WebKitTools/WebKitTestRunner/qt/main.cpp

(limited to 'WebKitTools/WebKitTestRunner/qt/main.cpp')

diff --git a/WebKitTools/WebKitTestRunner/qt/main.cpp b/WebKitTools/WebKitTestRunner/qt/main.cpp
deleted file mode 100644
index 4312a05..0000000
--- a/WebKitTools/WebKitTestRunner/qt/main.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 University of Szeged.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "TestController.h"
-
-#include <QApplication>
-#include <QObject>
-#include <QTimer>
-
-class Launcher : public QObject {
-    Q_OBJECT
-
-public:
-    Launcher(int argc, char** argv)
-        : m_argc(argc)
-        , m_argv(argv)
-    {
-    }
-
-    ~Launcher()
-    {
-        delete m_controller;
-    }
-
-public slots:
-    void launch()
-    {
-        m_controller = new WTR::TestController(m_argc, const_cast<const char**>(m_argv));
-        QApplication::exit();
-    }
-
-private:
-    WTR::TestController* m_controller;
-    int m_argc;
-    char** m_argv;
-};
-
-int main(int argc, char** argv)
-{
-    QApplication app(argc, argv);
-    Launcher launcher(argc, argv);
-    QTimer::singleShot(0, &launcher, SLOT(launch()));
-    return app.exec();;
-}
-
-#include "main.moc"
-- 
cgit v1.1