Changeset 26

Timestamp:

Jun 11, 2009, 2:59:46 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

configure.cmd: Resurrect QT_CONFIGURE_SETTINGS_PATH which is used by QSettings for settings in INI format (defaults to <boot_drv>:\OS2\xdg on OS/2).

File:

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

trunk/configure.cmd

@@ -271 +271 @@
     G.QT_INSTALL_DATA = ""
     G.QT_INSTALL_TRANSLATIONS = ""
+
     G.QT_INSTALL_EXAMPLES = ""
     G.QT_INSTALL_DEMOS = ""
@@ -503 +504 @@
     if (G.QT_INSTALL_TRANSLATIONS == "") then
         G.QT_INSTALL_TRANSLATIONS = FixDirNoSlash(G.QT_INSTALL_PREFIX)"\translations"
+
+
+
     /* examples */
     if (G.QT_INSTALL_EXAMPLES == "") then
@@ -585 +589 @@
 'static const char qt_configure_data_path_str         [260 + 12] = "qt_datapath='CPPPath(MaxLen(G.QT_INSTALL_DATA,259))'";'G.EOL||,
 'static const char qt_configure_translations_path_str [260 + 12] = "qt_trnspath='CPPPath(MaxLen(G.QT_INSTALL_TRANSLATIONS,259))'";'G.EOL||,
+
 'static const char qt_configure_examples_path_str     [260 + 12] = "qt_xmplpath='CPPPath(MaxLen(G.QT_INSTALL_EXAMPLES,259))'";'G.EOL||,
 'static const char qt_configure_demos_path_str        [260 + 12] = "qt_demopath='CPPPath(MaxLen(G.QT_INSTALL_DEMOS,259))'";'G.EOL||,
@@ -598 +603 @@
 '#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;'G.EOL||,
 '#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;'G.EOL||,
+
 '#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;'G.EOL||,
 '#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;'G.EOL||,
@@ -679 +685 @@
 
     curdir = directory(G.OutPath"\qmake")
-    /* @todo enable make */
-    say 'address' "cmd" G.MAKE
-    make_rc = 0 /*rc*/
+    address "cmd" G.MAKE
+    make_rc = rc
 
     /* put back original qconfig.h */