Changeset 1030 for trunk


Ignore:
Timestamp:
Aug 26, 2011, 7:48:22 PM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

OS/2: Remove suport for system-wide qt.conf files.

This turns not to be necessary. The new code is much simpler and has
less platform-dependent details. Note that hard-coded component paths
are now relative to the parent of the directory containing QtCore4.dll, not
to that directory itself as before. This in particular makes qt.conf not necessary
for the development builds at all.

For official (RPM) release builds, full hard-coded paths will be used so qt.conf
is not necessary at all. It will only be in use in portable ZIP distributions to
override these hard-coded paths of RPM builds.

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/configure.cmd

    r1020 r1030  
    350350    G.QT_INSTALL_EXAMPLES = ""
    351351    G.QT_INSTALL_DEMOS = ""
    352     G.QT_INSTALL_SYSCONFFILE = ""
    353352
    354353    G.QT_LIBINFIX = ""
     
    502501                    when (a == "-demosdir") then
    503502                        opt = 'P G.QT_INSTALL_DEMOS'
    504                     when (a == "-sysconffile") then
    505                         opt = 'P G.QT_INSTALL_SYSCONFFILE'
    506503
    507504                    when (a == "-nomake") then
     
    907904    --------------------------------------------------------------------------*/
    908905
     906
     907
     908
     909
     910
     911
     912
     913