Changeset 1030 for trunk/doc

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.

File:

• trunk/doc/src/deployment/qt-conf.qdoc (modified) (2 diffs)

trunk/doc/src/deployment/qt-conf.qdoc

@@ -43 +43 @@
     libraries look elsewhere.
 
-        Note that on OS/2, the libraries do not use the hard-coded paths
-        by default. Instead, they look for plugins and other components in a
-        directory that contains the QtCore DLL library (or the application
-        executable if Qt is built as a static library). This behavior may
-        also be overridden using the \c qt.conf file.
-    
     QLibraryInfo will load \c qt.conf from one of the following locations:
 
@@ -61 +55 @@
     QCoreApplication::applicationDirPath() + QDir::separator() + "qt.conf"
 
+    \o on OS/2, in the directory containing the QtCore dynamic library
+    (only after trying all of the above locations)
+
     \endlist
 
-    On OS/2, if neither of the above locations contains \c qt.conf,
-    QLibraryInfo will additionally try the following locations, in the
-    given order:
-
-    \list 1
-
-    \o \c qt.conf in the directory containing the QtCore DLL library
-    (or the application executable if Qt is built as a static library)
-
-    \o hard-coded system-wide \c .conf file (if set by the given build
-    of the Qt library)
-    
-    \o \c %ETC%\qt.conf
-    
-    \endlist
-    
     The \c qt.conf file is an INI text file, as described in the \l
     {QSettings::Format}{QSettings} documentation. The file should have