diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-20 13:01:08 +0200 |
| commit | 49233e234e5c787396cadb2cea33b31ae0cd65c1 (patch) | |
| tree | 5410cb9a8fd53168bb60d62c54b654d86f03c38d /Tools/QtTestBrowser | |
| parent | b211c645d8ab690f713515dfdc84d80b11c27d2c (diff) | |
| download | qtwebkit-49233e234e5c787396cadb2cea33b31ae0cd65c1.tar.gz | |
Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)
New snapshot with Windows build fixes
Diffstat (limited to 'Tools/QtTestBrowser')
| -rw-r--r-- | Tools/QtTestBrowser/QtTestBrowser.pro | 2 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/qttestbrowser.cpp (renamed from Tools/QtTestBrowser/main.cpp) | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tools/QtTestBrowser/QtTestBrowser.pro b/Tools/QtTestBrowser/QtTestBrowser.pro index 6d8a41b72..3bff49062 100644 --- a/Tools/QtTestBrowser/QtTestBrowser.pro +++ b/Tools/QtTestBrowser/QtTestBrowser.pro @@ -17,7 +17,7 @@ SOURCES += \ $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/QtInitializeTestFonts.cpp \ locationedit.cpp \ launcherwindow.cpp \ - main.cpp \ + qttestbrowser.cpp \ mainwindow.cpp \ urlloader.cpp \ utils.cpp \ diff --git a/Tools/QtTestBrowser/main.cpp b/Tools/QtTestBrowser/qttestbrowser.cpp index 34852910b..ab4bc70d4 100644 --- a/Tools/QtTestBrowser/main.cpp +++ b/Tools/QtTestBrowser/qttestbrowser.cpp @@ -318,4 +318,4 @@ int main(int argc, char **argv) return launcherMain(app); } -#include "main.moc" +#include "qttestbrowser.moc" |