diff options
| -rw-r--r-- | qmake/generators/win32/borland_bmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_dsp.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 8 | ||||
| -rw-r--r-- | src/kernel/ntqgplugin.h | 8 | ||||
| -rw-r--r-- | src/tools/qcom_p.h | 8 |
7 files changed, 16 insertions, 16 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index b7ca9c1a0..41666e3a0 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -386,7 +386,7 @@ BorlandMakefileGenerator::init() if(project->isEmpty("QMAKE_INSTALL_DIR")) project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); - bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "qtmt"TQTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "qtmt" TQTDLL_POSTFIX); TQStringList &configs = project->variables()["CONFIG"]; if (project->isActiveConfig("shared")) project->variables()["DEFINES"].append("QT_DLL"); diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 06cc0f764..a082a4aa7 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -397,7 +397,7 @@ MingwMakefileGenerator::init() if(project->isEmpty("QMAKE_INSTALL_DIR")) project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); - bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX); project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; // LIBS defined in Profile comes first for gcc diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index 010007375..f28969be2 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp @@ -623,7 +623,7 @@ DspMakefileGenerator::init() if ( project->variables()["QMAKESPEC"].isEmpty() ) project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); - bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX); project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; TQStringList &configs = project->variables()["CONFIG"]; diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index 2422a8a6d..75138b6ca 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -482,7 +482,7 @@ NmakeMakefileGenerator::init() if(project->isEmpty("QMAKE_INSTALL_DIR")) project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)"); - bool is_qt = (project->first("TARGET") == "qt"TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX); + bool is_qt = (project->first("TARGET") == "qt" TQTDLL_POSTFIX || project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX); project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"]; TQString targetfilename = project->variables()["TARGET"].first(); diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index ae0657acb..625ccf379 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -459,8 +459,8 @@ void VcprojGenerator::init() // Are we building TQt? bool is_qt = - ( project->first("TARGET") == "qt"TQTDLL_POSTFIX || - project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX ); + ( project->first("TARGET") == "qt" TQTDLL_POSTFIX || + project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX ); // Are we using TQt? bool isTQtActive = project->isActiveConfig("qt"); @@ -1097,8 +1097,8 @@ void VcprojGenerator::initOld() project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") ); bool is_qt = - ( project->first("TARGET") == "qt"TQTDLL_POSTFIX || - project->first("TARGET") == "tqt-mt"TQTDLL_POSTFIX ); + ( project->first("TARGET") == "qt" TQTDLL_POSTFIX || + project->first("TARGET") == "tqt-mt" TQTDLL_POSTFIX ); TQStringList &configs = project->variables()["CONFIG"]; diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h index f4fb7d783..135e6b811 100644 --- a/src/kernel/ntqgplugin.h +++ b/src/kernel/ntqgplugin.h @@ -81,10 +81,10 @@ #ifndef Q_PLUGIN_VERIFICATION_DATA # define Q_PLUGIN_VERIFICATION_DATA \ static const char *qt_ucm_verification_data = \ - "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ - "version="TQT_VERSION_STR"\n" \ - "flags="Q_PLUGIN_FLAGS_STRING"\n" \ - "buildkey="TQT_BUILD_KEY"\0"; + "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ + "version=" TQT_VERSION_STR "\n" \ + "flags=" Q_PLUGIN_FLAGS_STRING "\n" \ + "buildkey=" TQT_BUILD_KEY "\0"; #endif // Q_PLUGIN_VERIFICATION_DATA #define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \ diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h index d59017ca0..f3338ca07 100644 --- a/src/tools/qcom_p.h +++ b/src/tools/qcom_p.h @@ -296,10 +296,10 @@ public: \ #ifndef Q_UCM_VERIFICATION_DATA # define Q_UCM_VERIFICATION_DATA \ static const char *qt_ucm_verification_data = \ - "pattern=""QT_UCM_VERIFICATION_DATA""\n" \ - "version="TQT_VERSION_STR"\n" \ - "flags="Q_UCM_FLAGS_STRING"\n" \ - "buildkey="TQT_BUILD_KEY"\0"; + "pattern=" "QT_UCM_VERIFICATION_DATA" "\n" \ + "version=" TQT_VERSION_STR "\n" \ + "flags=" Q_UCM_FLAGS_STRING "\n" \ + "buildkey=" TQT_BUILD_KEY "\0"; #endif // Q_UCM_VERIFICATION_DATA // This macro expands to the default implementation of ucm_instantiate. |