diff --git a/Copying.txt b/Copying.txt new file mode 100644 index 0000000..4cd6620 --- /dev/null +++ b/Copying.txt @@ -0,0 +1,5 @@ +Simple x264 Launcher was created from the scratch by LoRd_MuldeR and is distributed under the terms of the GNU General Public License ('License.txt'). + +The Qt GUI Toolkit is Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies); the Qt GUI Toolkit may be distributed under the terms of GNU General Public License. + +x264 is Copyright (C) 2003-2012 'x264 project' and is distributed under the terms of GNU General Public License. Avs2YUV was created by Loren Merritt and BugMaster. diff --git a/src/main.cpp b/src/main.cpp index 7063f66..b790d61 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -73,7 +73,10 @@ static int x264_main(int argc, char* argv[]) WinSevenTaskbar::init(); //Set style - qApp->setStyle(new QPlastiqueStyle()); + if(!qApp->arguments().contains("--no-style", Qt::CaseInsensitive)) + { + qApp->setStyle(new QPlastiqueStyle()); + } //Create Main Window MainWindow *mainWin = new MainWindow(&cpuFeatures); diff --git a/src/version.h b/src/version.h index 0f5cbb9..111ae63 100644 --- a/src/version.h +++ b/src/version.h @@ -21,7 +21,7 @@ #define VER_X264_MAJOR 2 #define VER_X264_MINOR 0 -#define VER_X264_PATCH 52 +#define VER_X264_PATCH 55 #define VER_X264_MINIMUM_REV 2146 #define VER_X264_CURRENT_API 120 diff --git a/z_build.bat b/z_build.bat index a4e6e7a..c860238 100644 --- a/z_build.bat +++ b/z_build.bat @@ -24,6 +24,7 @@ mkdir "%PACK_PATH%\imageformats" mkdir "%PACK_PATH%\toolset" copy "%~dp0\bin\Release\*.exe" "%PACK_PATH%" copy "%~dp0\bin\Release\toolset\*.exe" "%PACK_PATH%\toolset" +copy "%~dp0\*.txt" "%PACK_PATH%" REM /////////////////////////////////////////////////////////////////////////// copy "%MSVC_PATH%\redist\x86\Microsoft.VC100.CRT\*.dll" "%PACK_PATH%" copy "%QTVC_PATH%\bin\QtCore4.dll" "%PACK_PATH%"