From f9f270a6c85fbf42de1e7bf34cc1887e90a0dcf1 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 28 Nov 2014 12:13:19 +0100 Subject: Doc: add navigation info to qmake Manual MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add the navigation.landingpage variable to the qdocconf file. Task-number: QTBUG-42965 Change-Id: Ia5ee411fc0dbd5cd8c2d238f346b0f1818b54289 Reviewed-by: Friedemann Kleint Reviewed-by: Topi Reiniö --- qmake/doc/qmake.qdocconf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'qmake') diff --git a/qmake/doc/qmake.qdocconf b/qmake/doc/qmake.qdocconf index bfdf1d1798..1a23237999 100644 --- a/qmake/doc/qmake.qdocconf +++ b/qmake/doc/qmake.qdocconf @@ -73,3 +73,5 @@ depends += \ qtx11extras \ qtxml \ qtxmlpatterns + +navigation.landingpage = "qmake Manual" -- cgit v1.2.3 From 98d130fc46ef5ff7c3d1138a4a9949a1c2594c47 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 2 Dec 2014 11:20:43 +0100 Subject: fix rc compilation in vcxproj files We don't need to modify ResourceOutputFileName. The default is fine, and $(InputName) evaluates to nothing in VS >= 2010. Change-Id: Ib203d36261e1b5449c5a139b1950bd0d66197297 Task-number: QTBUG-43026 Reviewed-by: Oswald Buddenhagen Reviewed-by: Andy Shaw --- qmake/generators/win32/msvc_vcproj.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'qmake') diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 9385a50e02..f271eb0679 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -1177,7 +1177,7 @@ void VcprojGenerator::initResourceTool() // to add it for the compiler) However, the resource tool does not do this. if(project->isActiveConfig("debug")) conf.resource.PreprocessorDefinitions += "_DEBUG"; - if(project->isActiveConfig("staticlib")) + if (conf.CompilerVersion < NET2010 && project->isActiveConfig("staticlib")) conf.resource.ResourceOutputFileName = "$(OutDir)\\$(InputName).res"; } -- cgit v1.2.3 From 0f88c5c1b99336a328f9a7123903fbc006251ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 1 Dec 2014 16:36:13 +0100 Subject: qmake: Add .qmake.stash/super to QMAKE_DISTCLEAN when owned by project MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Running 'make distclean' should remove all files generated by qmake, including .qmake.stash/super. These files are considered owned by a particular project (and hence a candidate for distclean), if it lives in the same directory as the output dir of the project. Task-number: QTBUG-42678 Change-Id: I224e9bac039eeacb6561e18acc7f8e867da5dab8 Reviewed-by: Oswald Buddenhagen Reviewed-by: Tor Arne Vestbø --- qmake/generators/makefile.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'qmake') diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index bf9a9d8343..4c501983d8 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -444,6 +444,22 @@ MakefileGenerator::init() setSystemIncludes(v["QMAKE_DEFAULT_INCDIRS"]); + const char * const cacheKeys[] = { "_QMAKE_STASH_", "_QMAKE_SUPER_CACHE_", 0 }; + for (int i = 0; cacheKeys[i]; ++i) { + if (v[cacheKeys[i]].isEmpty()) + continue; + const ProString &file = v[cacheKeys[i]].first(); + if (file.isEmpty()) + continue; + + QFileInfo fi(fileInfo(file.toQString())); + + // If the file lives in the output dir we treat it as 'owned' by + // the current project, so it should be distcleaned by it as well. + if (fi.path() == Option::output_dir) + v["QMAKE_DISTCLEAN"].append(fi.fileName()); + } + ProStringList &quc = v["QMAKE_EXTRA_COMPILERS"]; //make sure the COMPILERS are in the correct input/output chain order -- cgit v1.2.3 From c9f9eddc0f595b0382b070e3113122398c13876e Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Thu, 4 Dec 2014 13:50:46 +0100 Subject: Add missing documentation for some variables Task-number: QTBUG-5109 Change-Id: I38e12b957cad099d2f815a0d192cf3ab9fee52e5 Reviewed-by: Oswald Buddenhagen Reviewed-by: Joerg Bornemann --- qmake/doc/src/qmake-manual.qdoc | 64 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'qmake') diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index cdac770c9d..ed76e9cc61 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1195,6 +1195,12 @@ Please see \l{Setting the Application Icon}{the application icon documentation} for more information. + \target IDLSOURCES + \section1 IDLSOURCES + + This variable is used only on Windows for the Visual Studio project generation to + put the specified files in the Generated Files folder. + \target INCLUDEPATH \section1 INCLUDEPATH @@ -1304,6 +1310,12 @@ handled internally by qmake and rarely needs to be modified. + \target MSVCPROJ_* + \section1 MSVCPROJ_* + + These variables are handled internally by qmake and should not be modified + or utilized. + \target MOC_DIR \section1 MOC_DIR @@ -2110,6 +2122,38 @@ variable is typically handled by qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. + \target QMAKE_TARGET_COMPANY + \section1 QMAKE_TARGET_COMPANY + + Windows only. Specifies the company for the project target, this is used where + applicable for putting the company name in the application's properties. This is + only utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE + variables are not set. + + \target QMAKE_TARGET_DESCRIPTION + \section1 QMAKE_TARGET_DESCRIPTION + + Windows only. Specifies the description for the project target, this is used where + applicable for putting the description in the application's properties. This is only + utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables + are not set. + + \target QMAKE_TARGET_COPYRIGHT + \section1 QMAKE_TARGET_COPYRIGHT + + Windows only. Specifies the copyright information for the project target, this is used where + applicable for putting the copyright information in the application's properties. This is only + utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables + are not set. + + \target QMAKE_TARGET_PRODUCT + \section1 QMAKE_TARGET_PRODUCT + + Windows only. Specifies the product for the project target, this is used where + applicable for putting the product in the application's properties. This is only utilized if + the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables + are not set. + \section1 QT Specifies the Qt modules that are used by your project. @@ -2209,6 +2253,26 @@ qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. + \target RC_CODEPAGE + \section1 RC_CODEPAGE + + Windows only. Specifies the codepage that should be specified in a generated rc file. This is + only utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables + are not set. + + \target RC_ICONS + \section1 RC_ICONS + + Windows only. Specifies the icons that should be included into a generated rc file, this + is only utilized if the RC_FILE and RES_FILE variable are not set. + + \target RC_LANG + \section1 RC_LANG + + Windows only. Specifies the language that should be specified in a generated rc file. This is + only utilized if the VERSION or RC_ICONS variable is set and the RC_FILE and RES_FILE variables + are not set. + \section1 RC_INCLUDEPATH Specifies include paths that are passed to the Windows Resource Compiler. -- cgit v1.2.3