Changeset 26


Ignore:
Timestamp:
Jun 11, 2009, 12:59:46 PM (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.cmd

    r14 r26  
    271271    G.QT_INSTALL_DATA = ""
    272272    G.QT_INSTALL_TRANSLATIONS = ""
     273    G.QT_INSTALL_SETTINGS = ""
    273274    G.QT_INSTALL_EXAMPLES = ""
    274275    G.QT_INSTALL_DEMOS = ""
     
    503504    if (G.QT_INSTALL_TRANSLATIONS == "") then
    504505        G.QT_INSTALL_TRANSLATIONS = FixDirNoSlash(G.QT_INSTALL_PREFIX)"\translations"
     506    /* settings */
     507    if (G.QT_INSTALL_SETTINGS == "") then
     508        G.QT_INSTALL_SETTINGS = SysBootDrive()"\OS2\xdg"
    505509    /* examples */
    506510    if (G.QT_INSTALL_EXAMPLES == "") then
     
    585589'static const char qt_configure_data_path_str         [260 + 12] = "qt_datapath='CPPPath(MaxLen(G.QT_INSTALL_DATA,259))'";'G.EOL||,
    586590'static const char qt_configure_translations_path_str [260 + 12] = "qt_trnspath='CPPPath(MaxLen(G.QT_INSTALL_TRANSLATIONS,259))'";'G.EOL||,
     591'static const char qt_configure_settings_path_str     [260 + 12] = "qt_stngpath='CPPPath(MaxLen(G.QT_INSTALL_SETTINGS,259))'";'G.EOL||,
    587592'static const char qt_configure_examples_path_str     [260 + 12] = "qt_xmplpath='CPPPath(MaxLen(G.QT_INSTALL_EXAMPLES,259))'";'G.EOL||,
    588593'static const char qt_configure_demos_path_str        [260 + 12] = "qt_demopath='CPPPath(MaxLen(G.QT_INSTALL_DEMOS,259))'";'G.EOL||,
     
    598603'#define QT_CONFIGURE_DATA_PATH qt_configure_data_path_str + 12;'G.EOL||,
    599604'#define QT_CONFIGURE_TRANSLATIONS_PATH qt_configure_translations_path_str + 12;'G.EOL||,
     605'#define QT_CONFIGURE_SETTINGS_PATH qt_configure_settings_path_str + 12;'G.EOL||,
    600606'#define QT_CONFIGURE_EXAMPLES_PATH qt_configure_examples_path_str + 12;'G.EOL||,
    601607'#define QT_CONFIGURE_DEMOS_PATH qt_configure_demos_path_str + 12;'G.EOL||,
     
    679685
    680686    curdir = directory(G.OutPath"\qmake")
    681     /* @todo enable make */
    682     say 'address' "cmd" G.MAKE
    683     make_rc = 0 /*rc*/
     687    address "cmd" G.MAKE
     688    make_rc = rc
    684689
    685690    /* put back original qconfig.h */
Note: See TracChangeset for help on using the changeset viewer.