Introduce 'qt_ver' GYP variable (#775)

As a preparation of Qt6 migration, this commit introduces 'qt_ver' GYP
variable, which is still set to '5' by default into GYP builds.

This is a mechanical cleanup, and there must be no behavior change.
Also there must be no impact on Bazel builds.

#codehealth

PiperOrigin-RevId: 552690457

Author: yukawa

src/build_tools/change_reference_mac.py

@@ -32,7 +32,7 @@
 
 Typical usage:
 
-  % change_reference_mac.py --qtdir=/path/to/qtdir/ \
+  % change_reference_mac.py --qtdir=/path/to/qtdir/ --qtver=5 \
       --target=/path/to/target.app/Contents/MacOS/target
 """
 
@@ -49,6 +49,7 @@ def ParseOption():
   """Parse command line options."""
   parser = optparse.OptionParser()
   parser.add_option('--qtdir', dest='qtdir')
+  parser.add_option('--qtver', dest='qtver')
   parser.add_option('--target', dest='target')
 
   (opts, _) = parser.parse_args()
@@ -76,28 +77,32 @@ def main():
   if not opt.qtdir:
     PrintErrorAndExit('--qtdir option is mandatory.')
 
+  if not opt.qtver:
+    PrintErrorAndExit('--qtver option is mandatory.')
+
   if not opt.target:
     PrintErrorAndExit('--target option is mandatory.')
 
   unused_qtdir = os.path.abspath(opt.qtdir)  # TODO(komatsu): remove this.
   target = os.path.abspath(opt.target)
+  qtver = str(opt.qtver)
 
   # Changes the reference to QtCore framework from the target application
   # From: @rpath/QtCore.framework/Versions/5/QtCore
   #   To: @executable_path/../../../MozcTool.app/Contents/Frameworks/...
-  qtcore_framework = GetFrameworkPath('QtCore', '5')
+  qtcore_framework = GetFrameworkPath('QtCore', qtver)
   InstallNameTool(target,
                   '@rpath/%s' % qtcore_framework,
                   GetReferenceTo(qtcore_framework))
 
   # Changes the reference to QtGui framework from the target application
-  qtgui_framework = GetFrameworkPath('QtGui', '5')
+  qtgui_framework = GetFrameworkPath('QtGui', qtver)
   InstallNameTool(target,
                   '@rpath/%s' % qtgui_framework,
                   GetReferenceTo(qtgui_framework))
 
   # Changes the reference to QtWidgets framework from the target application
-  qtwidgets_framework = GetFrameworkPath('QtWidgets', '5')
+  qtwidgets_framework = GetFrameworkPath('QtWidgets', qtver)
   InstallNameTool(target,
                   '@rpath/%s' % qtwidgets_framework,
                   GetReferenceTo(qtwidgets_framework))

src/gui/gui.gyp

@@ -687,6 +687,7 @@
                   'action': [
                     '<(python)', '../build_tools/change_reference_mac.py',
                     '--qtdir', '<(qt_dir)',
+                    '--qtver', '<(qt_ver)',
                     '--target',
                     '${BUILT_PRODUCTS_DIR}/GuiTool_lib.framework/Versions/A/GuiTool_lib',
                   ],
@@ -951,6 +952,7 @@
                   'action': [
                     '<(python)', '../build_tools/change_reference_mac.py',
                     '--qtdir', '<(qt_dir)',
+                    '--qtver', '<(qt_ver)',
                     '--target',
                     '${BUILT_PRODUCTS_DIR}/<(product_name).app/Contents/MacOS/<(product_name)',
                   ],

src/gui/mac_gui.gypi

@@ -47,6 +47,7 @@
           'action': [
             '<(python)', '../build_tools/change_reference_mac.py',
             '--qtdir', '<(qt_dir)',
+            '--qtver', '<(qt_ver)',
             '--target',
             '${BUILT_PRODUCTS_DIR}/<(product_name).app/Contents/MacOS/<(product_name)',
           ],

src/gui/qt_libraries.gypi

@@ -53,9 +53,9 @@
                 '<(qt_dir)/lib',
               ],
               'AdditionalDependencies': [
-                'Qt5Cored.lib',
-                'Qt5Guid.lib',
-                'Qt5Widgetsd.lib',
+                'Qt<(qt_ver)Cored.lib',
+                'Qt<(qt_ver)Guid.lib',
+                'Qt<(qt_ver)Widgetsd.lib',
               ],
             },
           },
@@ -67,9 +67,9 @@
                 '<(qt_dir)/lib',
               ],
               'AdditionalDependencies': [
-                'Qt5Core.lib',
-                'Qt5Gui.lib',
-                'Qt5Widgets.lib',
+                'Qt<(qt_ver)Core.lib',
+                'Qt<(qt_ver)Gui.lib',
+                'Qt<(qt_ver)Widgets.lib',
               ],
             },
           },
@@ -109,8 +109,8 @@
       ]
     }],
     ['target_platform=="Linux"', {
-      'cflags': ['<!@(pkg-config --cflags Qt5Widgets Qt5Gui Qt5Core)'],
-      'libraries': ['<!@(pkg-config --libs Qt5Widgets Qt5Gui Qt5Core)'],
+      'cflags': ['<!@(pkg-config --cflags Qt<(qt_ver)Widgets Qt<(qt_ver)Gui Qt<(qt_ver)Core)'],
+      'libraries': ['<!@(pkg-config --libs Qt<(qt_ver)Widgets Qt<(qt_ver)Gui Qt<(qt_ver)Core)'],
     }],
     # Workarounds related with clang.
     ['(_toolset=="target" and compiler_target=="clang") or '

src/gui/qt_moc.gypi

@@ -34,7 +34,7 @@
   'variables': {
     'conditions': [
       ['target_platform=="Linux"', {
-        'moc_path': '<!(pkg-config --variable=host_bins Qt5Core)/moc',
+        'moc_path': '<!(pkg-config --variable=host_bins Qt<(qt_ver)Core)/moc',
       }, 'qt_dir', {
         'moc_path': '<(qt_dir)/bin/moc<(EXECUTABLE_SUFFIX)',
       }, {

src/gui/qt_rcc.gypi

@@ -34,7 +34,7 @@
   'variables': {
     'conditions': [
       ['target_platform=="Linux"', {
-        'rcc_path': '<!(pkg-config --variable=host_bins Qt5Core)/rcc',
+        'rcc_path': '<!(pkg-config --variable=host_bins Qt<(qt_ver)Core)/rcc',
       }, 'qt_dir', {
         'rcc_path': '<(qt_dir)/bin/rcc<(EXECUTABLE_SUFFIX)',
       }, {

src/gui/qt_uic.gypi

@@ -34,7 +34,7 @@
   'variables': {
     'conditions': [
       ['target_platform=="Linux"', {
-        'uic_path': '<!(pkg-config --variable=host_bins Qt5Core)/uic',
+        'uic_path': '<!(pkg-config --variable=host_bins Qt<(qt_ver)Core)/uic',
       }, 'qt_dir', {
         'uic_path': '<(qt_dir)/bin/uic<(EXECUTABLE_SUFFIX)',
       }, {

src/gyp/defines.gypi

@@ -53,6 +53,9 @@
     # use_qt is 'YES' only if you want to use GUI binaries.
     'use_qt%': 'YES',
 
+    # Qt version to be used.
+    'qt_ver%': '5',
+
     # use_libprotobuf represents if protobuf library is used or not.
     # This option is only for Linux.
     # You should not set this flag if you want to use "dlopen" to

src/win32/installer/installer.gyp

@@ -160,6 +160,7 @@
                 '-dCustomActions64Path=<(mozc_ca64_path)',
                 '-dDocumentsDir=<(document_dir)',
                 '-dQtDir=<(qt_dir)',
+                '-dQtVer=<(qt_ver)',
                 '-o', '<@(_outputs)',
                 # We do not use '<@(_inputs)' here because it contains some
                 # input files just for peoper rebiuld condition.

src/win32/installer/installer_64bit.wxs

@@ -31,12 +31,12 @@
 -->
 
 
-<?define QtCoreFilename="Qt5Core.dll" ?>
-<?define QtCoredFilename="Qt5Cored.dll" ?>
-<?define QtGuiFilename="Qt5Gui.dll" ?>
-<?define QtGuidFilename="Qt5Guid.dll" ?>
-<?define QtWidgetsFilename="Qt5Widgets.dll" ?>
-<?define QtWidgetsdFilename="Qt5Widgetsd.dll" ?>
+<?define QtCoreFilename="Qt$(var.QtVer)Core.dll" ?>
+<?define QtCoredFilename="Qt$(var.QtVer)Cored.dll" ?>
+<?define QtGuiFilename="Qt$(var.QtVer)Gui.dll" ?>
+<?define QtGuidFilename="Qt$(var.QtVer)Guid.dll" ?>
+<?define QtWidgetsFilename="Qt$(var.QtVer)Widgets.dll" ?>
+<?define QtWidgetsdFilename="Qt$(var.QtVer)Widgetsd.dll" ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
 

src/win32/installer/installer_oss_64bit.wxs

@@ -31,12 +31,12 @@
 -->
 
 
-<?define QtCoreFilename="Qt5Core.dll" ?>
-<?define QtCoredFilename="Qt5Cored.dll" ?>
-<?define QtGuiFilename="Qt5Gui.dll" ?>
-<?define QtGuidFilename="Qt5Guid.dll" ?>
-<?define QtWidgetsFilename="Qt5Widgets.dll" ?>
-<?define QtWidgetsdFilename="Qt5Widgetsd.dll" ?>
+<?define QtCoreFilename="Qt$(var.QtVer)Core.dll" ?>
+<?define QtCoredFilename="Qt$(var.QtVer)Cored.dll" ?>
+<?define QtGuiFilename="Qt$(var.QtVer)Gui.dll" ?>
+<?define QtGuidFilename="Qt$(var.QtVer)Guid.dll" ?>
+<?define QtWidgetsFilename="Qt$(var.QtVer)Widgets.dll" ?>
+<?define QtWidgetsdFilename="Qt$(var.QtVer)Widgetsd.dll" ?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>