diff options
author | Timothy Pearson <[email protected]> | 2011-12-05 22:04:08 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-05 22:04:08 -0600 |
commit | e02e31c8b9d854cd62cbe9799228f6e08e882773 (patch) | |
tree | 53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /qmake/generators/win32 | |
parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip |
Sync with latest script
Diffstat (limited to 'qmake/generators/win32')
-rw-r--r-- | qmake/generators/win32/borland_bmake.cpp | 4 | ||||
-rw-r--r-- | qmake/generators/win32/borland_bmake.h | 2 | ||||
-rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 4 | ||||
-rw-r--r-- | qmake/generators/win32/mingw_make.h | 2 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_dsp.cpp | 4 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_dsp.h | 2 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 6 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_nmake.h | 2 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 2 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 6 | ||||
-rw-r--r-- | qmake/generators/win32/msvc_vcproj.h | 2 | ||||
-rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 2 | ||||
-rw-r--r-- | qmake/generators/win32/winmakefile.h | 2 |
14 files changed, 21 insertions, 21 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index 218014b0c..fbbc1dfcb 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -55,7 +55,7 @@ BorlandMakefileGenerator::writeMakefile(TQTextStream &t) writeHeader(t); if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { t << "all clean:" << "\n\t" - << "@echo \"Some of the retquired modules (" + << "@echo \"Some of the required modules (" << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t" << "@echo \"Skipped.\"" << endl << endl; return TRUE; diff --git a/qmake/generators/win32/borland_bmake.h b/qmake/generators/win32/borland_bmake.h index bae9752fa..73af89b76 100644 --- a/qmake/generators/win32/borland_bmake.h +++ b/qmake/generators/win32/borland_bmake.h @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 5afb16d37..c792ae3c5 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -61,7 +61,7 @@ MingwMakefileGenerator::writeMakefile(TQTextStream &t) writeHeader(t); if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { t << "all clean:" << "\n\t" - << "@echo \"Some of the retquired modules (" + << "@echo \"Some of the required modules (" << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t" << "@echo \"Skipped.\"" << endl << endl; writeMakeQmake(t); diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h index 6058d7d13..51679bf51 100644 --- a/qmake/generators/win32/mingw_make.h +++ b/qmake/generators/win32/mingw_make.h @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index 8534d6908..e027bd121 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -53,7 +53,7 @@ DspMakefileGenerator::writeMakefile(TQTextStream &t) { if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { /* for now just dump, I need to generated an empty dsp or something.. */ - fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n", + fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", var("QMAKE_FAILED_RETQUIREMENTS").latin1()); return TRUE; } diff --git a/qmake/generators/win32/msvc_dsp.h b/qmake/generators/win32/msvc_dsp.h index 99c6a1051..eedc81a95 100644 --- a/qmake/generators/win32/msvc_dsp.h +++ b/qmake/generators/win32/msvc_dsp.h @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index d82977f0b..e8b0cde59 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -60,7 +60,7 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t) t << *it << " "; } t << "all clean:" << "\n\t" - << "@echo \"Some of the retquired modules (" + << "@echo \"Some of the required modules (" << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t" << "@echo \"Skipped.\"" << endl << endl; writeMakeQmake(t); @@ -744,7 +744,7 @@ NmakeMakefileGenerator::init() // Created files precompObj = var("OBJECTS_DIR") + project->first("TARGET") + "_pch" + Option::obj_ext; precompPch = var("OBJECTS_DIR") + project->first("TARGET") + "_pch.pch"; - // Add linking of precompObj (retquired for whole precompiled classes) + // Add linking of precompObj (required for whole precompiled classes) project->variables()["OBJECTS"] += precompObj; // Add pch file to cleanup project->variables()["QMAKE_CLEAN"] += precompPch; diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h index 22d3c1aa7..875d04074 100644 --- a/qmake/generators/win32/msvc_nmake.h +++ b/qmake/generators/win32/msvc_nmake.h @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 7b89932e4..e4695962d 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index 759242345..a84971683 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index f22901b14..a17b32ac7 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: @@ -181,9 +181,9 @@ VcprojGenerator::VcprojGenerator(TQMakeProject *p) : Win32MakefileGenerator(p), */ bool VcprojGenerator::writeMakefile(TQTextStream &t) { - // Check if all retquirements are fullfilled + // Check if all requirements are fullfilled if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { - fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n", + fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n", var("QMAKE_FAILED_RETQUIREMENTS").latin1()); return TRUE; } diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h index c6ec5cb11..9e5488045 100644 --- a/qmake/generators/win32/msvc_vcproj.h +++ b/qmake/generators/win32/msvc_vcproj.h @@ -17,7 +17,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index 6c92cb747..a4fbbde45 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h index 395638025..cde18cea4 100644 --- a/qmake/generators/win32/winmakefile.h +++ b/qmake/generators/win32/winmakefile.h @@ -16,7 +16,7 @@ ** and the KDE Free TQt Foundation. ** ** Please review the following information to ensure GNU General -** Public Licensing retquirements will be met: +** Public Licensing requirements will be met: ** http://trolltech.com/products/qt/licenses/licensing/opensource/. ** If you are unsure which license is appropriate for your use, please ** review the following information: |