Changeset 561 for trunk/doc/src/deployment

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/deployment (copied) (copied from branches/vendor/nokia/qt/4.6.1/doc/src/deployment )
• doc/src/deployment/deployment-plugins.qdoc (copied) (copied from branches/vendor/nokia/qt/4.6.1/doc/src/deployment/deployment-plugins.qdoc )
• doc/src/deployment/deployment.qdoc (copied) (copied from branches/vendor/nokia/qt/4.6.1/doc/src/deployment/deployment.qdoc )
• doc/src/deployment/qt-conf.qdoc (copied) (copied from branches/vendor/nokia/qt/4.6.1/doc/src/deployment/qt-conf.qdoc ) (3 diffs)
• doc/src/deployment/qtconfig.qdoc (copied) (copied from branches/vendor/nokia/qt/4.6.1/doc/src/deployment/qtconfig.qdoc )

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

@@ -57 +57 @@
     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:
 
@@ -71 +77 @@
     \endlist
 
+    On OS/2, if neither of the above locations contains \c qt.conf,
+    QLibraryInfo will additionally try the following two locations:
+
+    \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 \c %ETC%\qtsys.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
@@ -105 +123 @@
     need to be placed in specific sub-directories under the
     \c{plugins} directory (see \l{How to Create Qt Plugins} for
-    details).
-
+    details). On OS/2, the \c Prefix is always relative to the directory
+    where \c qt.conf or \c qtsys.conf is loaded from.
+    
     For example, a \c qt.conf file could contain the following: