Changeset 1049 for trunk/src

Timestamp:

Sep 3, 2011, 10:08:25 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: Make sure QMAKE_TARGET_COMPANY is always Nokia.

Doesn't make much sense to netlabs.org and using $(USER) in
custom builds is against privacy.

File:

• trunk/src/qt_targets.pri (modified) (1 diff)

trunk/src/qt_targets.pri

@@ -11 +11 @@
 
 os2 {
-    # set QMAKE_TARGET_COMPANY to the actual binary OS/2 build vendor. The above
-    # copyright notice will be still retained in the DLL and EXE description.
-        contains(QT_CONFIG, official_build):QMAKE_TARGET_COMPANY = netlabs.org
-        else:QMAKE_TARGET_COMPANY = $$(USER)
-        isEmpty(QMAKE_TARGET_COMPANY):QMAKE_TARGET_COMPANY = anonymous
-
-        # extend the version number included in DLLs and EXEs with the SVN revision number
-        DEF_FILE_VERSION = $$VERSION
-    !isEmpty(QT_BUILD_VERSION):DEF_FILE_VERSION = $${DEF_FILE_VERSION}.$${QT_BUILD_VERSION}
-    !isEmpty(QMAKESPEC):DEF_FILE_VERSION = $${DEF_FILE_VERSION}.$$basename(QMAKESPEC)
+    # too long company name does not fit
+    QMAKE_TARGET_COMPANY = Nokia
+    !isEmpty(QT_BUILD_VERSION) {
+        # extend the version number embedded in EXEs/DLLs with the build number
+        DEF_FILE_VERSION = $$VERSION.$${QT_BUILD_VERSION}
+    }
 }