Changeset 892

Timestamp:

Jul 14, 2011, 11:02:03 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Added support for setting QLibraryInfo::ImportsPath through the 'importdir' command line option.

File:

• trunk/configure.cmd (modified) (4 diffs)

trunk/configure.cmd

@@ -344 +344 @@
     G.QT_INSTALL_BINS = ""
     G.QT_INSTALL_PLUGINS = ""
+    G.QT_INSTALL_IMPORTS = ""
     G.QT_INSTALL_DATA = ""
     G.QT_INSTALL_TRANSLATIONS = ""
@@ -445 +446 @@
                     when (a == "plugindir") then
                         opt = 'G.QT_INSTALL_PLUGINS'
+                    when (a == "importdir") then
+                        opt = 'G.QT_INSTALL_IMPORTS'
                     when (a == "demosdir") then
                         opt = 'G.QT_INSTALL_DEMOS'
@@ -730 +733 @@
     if (G.QT_INSTALL_PLUGINS == "") then
         G.QT_INSTALL_PLUGINS = "plugins"
+    /* imports */
+    if (G.QT_INSTALL_IMPORTS == "") then
+        G.QT_INSTALL_IMPORTS = "imports"
     /* data */
     if (G.QT_INSTALL_DATA == "") then
@@ -831 +837 @@
 '#define QT_CONFIGURE_BINARIES_PATH "'CPPPath(G.QT_INSTALL_BINS)'"'G.EOL||,
 '#define QT_CONFIGURE_PLUGINS_PATH "'CPPPath(G.QT_INSTALL_PLUGINS)'"'G.EOL||,
+'#define QT_CONFIGURE_IMPORTS_PATH "'CPPPath(G.QT_INSTALL_IMPORTS)'"'G.EOL||,
 '#define QT_CONFIGURE_DATA_PATH "'CPPPath(G.QT_INSTALL_DATA)'"'G.EOL||,
 '#define QT_CONFIGURE_TRANSLATIONS_PATH "'CPPPath(G.QT_INSTALL_TRANSLATIONS)'"'G.EOL||,