Skip to content

Commit

Permalink
Add auto line-ending handling
Browse files Browse the repository at this point in the history
  • Loading branch information
rocketman768 committed Aug 2, 2014
1 parent da9894d commit f0ff6b3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
36 changes: 18 additions & 18 deletions dev-doc/WindowsQtSDKBuild.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
Install SDK
Add c:\Qt\<version>\bin and c:\Qt\<version>\qt\bin to the environment variables.
Run the MSVS command prompt (Programs->MSVS->Tools) and possibly vcvarsall.bat when you get there.
cd to c:\Qt\<version>\qt
Run configure
Options: -platform win32-msvc2008 -debug-and-release -opensource -shared -no-qt3support -phonon -phonon-backend -webkit -arch windows -qt-style-windows -qt-style-windowsvista -qt-style-plastique -qt-style-cleanlooks
Run nmake and wait forever.
If the error "NMAKE: fatal error U1077" appears, try deleting these temporary files and running nmake again:
\src\3rdparty\webkit\WebCore\tmp\moc\debug_shared\mocinclude.tmp
\src\3rdparty\webkit\WebCore\tmp\moc\release_shared\mocinclude.tmp
\src\script\tmp\moc\debug_shared\mocinclude.tmp
\src\script\tmp\moc\release_shared\mocinclude.tmp
Install SDK

Add c:\Qt\<version>\bin and c:\Qt\<version>\qt\bin to the environment variables.

Run the MSVS command prompt (Programs->MSVS->Tools) and possibly vcvarsall.bat when you get there.

cd to c:\Qt\<version>\qt

Run configure
Options: -platform win32-msvc2008 -debug-and-release -opensource -shared -no-qt3support -phonon -phonon-backend -webkit -arch windows -qt-style-windows -qt-style-windowsvista -qt-style-plastique -qt-style-cleanlooks

Run nmake and wait forever.

If the error "NMAKE: fatal error U1077" appears, try deleting these temporary files and running nmake again:
\src\3rdparty\webkit\WebCore\tmp\moc\debug_shared\mocinclude.tmp
\src\3rdparty\webkit\WebCore\tmp\moc\release_shared\mocinclude.tmp
\src\script\tmp\moc\debug_shared\mocinclude.tmp
\src\script\tmp\moc\release_shared\mocinclude.tmp

0 comments on commit f0ff6b3

Please sign in to comment.