From f01e5dcc1f23786f5189cf2690f3a47d381e6b4b Mon Sep 17 00:00:00 2001 From: bel2125 Date: Sat, 26 Mar 2016 14:27:26 +0100 Subject: [PATCH] Remove not maintained Browser test util --- VS2012/civetweb.sln | 16 +--- testutils/Browser/Browser.cpp | 119 ------------------------------ testutils/Browser/Browser.vcxproj | 92 ----------------------- 3 files changed, 3 insertions(+), 224 deletions(-) delete mode 100644 testutils/Browser/Browser.cpp delete mode 100644 testutils/Browser/Browser.vcxproj diff --git a/VS2012/civetweb.sln b/VS2012/civetweb.sln index 05e5651e..3525dacd 100644 --- a/VS2012/civetweb.sln +++ b/VS2012/civetweb.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual C++ Express 2010 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb_lua", "civetweb_lua\civetweb_lua.vcxproj", "{9BE9C008-E851-42B1-A034-BD4630AE4CD6}" ProjectSection(ProjectDependencies) = postProject {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD} = {0A11689C-DB6A-4BF6-97B2-AD32DB863FBD} @@ -18,8 +20,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "upload", "upload\upload.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient", "..\testutils\testclient\testclient.vcxproj", "{15D6AAA6-36CE-453B-ABBF-3C52BD247EBE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Browser", "..\testutils\Browser\Browser.vcxproj", "{277772B0-D4B3-451E-86B6-261FBC645793}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testclient2", "..\testutils\testclient_chunked_linux\testclient2.vcxproj", "{150140C5-2989-4D0D-8714-5A47B78EAD4D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "duktape_lib", "duktape_lib\duktape_lib.vcxproj", "{0A11689C-DB6A-4BF6-97B2-AD32DB863FBD}" @@ -114,16 +114,6 @@ Global {15D6AAA6-36CE-453B-ABBF-3C52BD247EBE}.Release|Win32.ActiveCfg = Release|Win32 {15D6AAA6-36CE-453B-ABBF-3C52BD247EBE}.Release|Win32.Build.0 = Release|Win32 {15D6AAA6-36CE-453B-ABBF-3C52BD247EBE}.Release|x64.ActiveCfg = Release|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Debug|Win32.ActiveCfg = Debug|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Debug|Win32.Build.0 = Debug|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Debug|x64.ActiveCfg = Debug|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Release|Mixed Platforms.Build.0 = Release|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Release|Win32.ActiveCfg = Release|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Release|Win32.Build.0 = Release|Win32 - {277772B0-D4B3-451E-86B6-261FBC645793}.Release|x64.ActiveCfg = Release|Win32 {150140C5-2989-4D0D-8714-5A47B78EAD4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {150140C5-2989-4D0D-8714-5A47B78EAD4D}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {150140C5-2989-4D0D-8714-5A47B78EAD4D}.Debug|Win32.ActiveCfg = Debug|Win32 diff --git a/testutils/Browser/Browser.cpp b/testutils/Browser/Browser.cpp deleted file mode 100644 index 61148968..00000000 --- a/testutils/Browser/Browser.cpp +++ /dev/null @@ -1,119 +0,0 @@ -// To build the source, set your drive letter Q: to the Qt SDK root, -// e.g., use "subst q: C:\QtSDK\Desktop\Qt\4.8.0\msvc2010" on the cmd line. -// This minimal source is derived from http://trac.webkit.org/wiki/QtWebKitTiling, -// for an example with more features see http://doc.qt.nokia.com/qt-maemo/maemo5-graphicswebview.html - - -#include -#include -#include -#include -#include -#include - -#include -#include - - -const char * DEFAULT_URL = "http://localhost/"; -const char * DEFAULT_SIZE = "550x720"; -const char * DEFAULT_PROXY = 0; - - -static void ShowUsage(const char * exeName) { - - const char * name = ""; - if (exeName) { - name = strrchr(exeName, '\\'); - if (name) { - name++; - } else { - name = exeName; - } - } - - std::string msg = "Usage:\n"; - msg += " " + std::string(name) + " [-w###x###] [url]\n"; - msg += " " + std::string(name) + " -h\n\n"; - msg += "Use -w###x### to specify the window size\n"; - MessageBoxA(NULL, msg.c_str(), name, MB_ICONINFORMATION); -} - - -class BGraphicsWebView : public QGraphicsWebView { -public: - bool loadFinished(bool); -}; - - -bool BGraphicsWebView::loadFinished(bool) { - return 0; -} - - -int main(int argc, char *argv[]) { - - const char * url = DEFAULT_URL; - const char * size = DEFAULT_SIZE; - const char * proxy = DEFAULT_PROXY; - - for (int i = 1; i - - - - Debug - Win32 - - - Release - Win32 - - - - {277772B0-D4B3-451E-86B6-261FBC645793} - Win32Proj - Browser - - - - Application - true - Unicode - v140 - - - Application - false - true - Unicode - v140 - - - - - - - - - - - - - true - $(ProjectDir)$(Configuration)\ - - - false - $(ProjectDir)$(Configuration)\ - - - - - - Level3 - Disabled - _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - Q:\include\QtGui\;Q:\include\;Q:\include\QtWebKit\;Q:\include\QtNetwork\ - - - Windows - true - qtmaind.lib;QtGuid4.lib;QtCored4.lib;QtWebKitd4.lib;QtNetworkd4.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Q:\lib - - - - - Level3 - - - MaxSpeed - true - true - _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - Q:\include\QtGui\;Q:\include\;Q:\include\QtWebKit\;Q:\include\QtNetwork\ - - - Windows - true - true - true - qtmain.lib;QtGui4.lib;QtCore4.lib;QtWebKit4.lib;QtNetwork4.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - Q:\lib - - - - - - - - - \ No newline at end of file