Changeset 89

Timestamp:

Apr 17, 2006, 8:41:04 PM (19 years ago)

Author:

dmik

Message:

The VERSION project variable is now copied by qmake (as is) to the generated makefile.

Location:

trunk

Files:

• os2-doc/doc.html (modified) (1 diff)
• qmake/generators/os2/gnumake.cpp (modified) (1 diff)

trunk/os2-doc/doc.html

@@ -335 +335 @@
     <code>$(RES_FILE)</code> to specify the <kbd>.res</kbd> file to bind and
     <code>$(TARGET)</code> to specify the executable file name.</p>
+
+    <p>20. Added the internal qmake variable
+    <code>QMAKE_LIBDIR_QT_DEBUG</code>. It defines where to place the Qt
+    library when the debug version is being built, and also where to search
+    for it when the project file of an application contains <kbd>qt</kbd> and
+    <kbd>debug</kbd> keywords in the <code>CONFIG</code> statement.</p>
+
+    <p>21. The <code>VERSION</code> project variable is copied by qmake (as
+    is) to the generated makefile. Note that its value does not affect the
+    name of the generated DLL target anymore (for projects with the
+    <kbd>lib</kbd> template and with the <kbd>dll</kbd> keyword in
+    <code>CONFIG</code>), as opposed to other qmake backends. Appending a
+    version number to the DLL name could implicitly lead to running out of the
+    8x3 naming limit that is still present in OS/2 for DLLs loaded by module
+    name (the most common case). Instead, the <code>VERSION</code> macro can
+    be used by qmake compiler specifications to embed the version to the
+    generated DLL file itself (as the GCC specification does).</p>
   </body>
 </html>

trunk/qmake/generators/os2/gnumake.cpp

@@ -229 +229 @@
         t << project->variables()[ "TARGET" ].first() << project->variables()[ "TARGET_EXT" ].first();
     t << endl;
+
+    if ( !project->isEmpty( "VERSION" ) ) {
+        t << "VERSION   =       " << var("VERSION") << endl;
+    }
     t << endl;