Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	doc/src/qnamespace.qdoc
	doc/src/snippets/code/src_gui_qproxystyle.cpp
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebKit/qt/ChangeLog
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication_x11.cpp
	src/gui/kernel/qt_x11_p.h
	src/gui/kernel/qwidget.cpp
	src/gui/styles/qproxystyle.cpp
	src/gui/styles/qstyle.cpp
	src/scripttools/debugging/qscriptdebugger.cpp
	src/scripttools/debugging/qscriptenginedebugger.cpp
	src/sql/drivers/odbc/qsql_odbc.cpp
	src/sql/kernel/qsqldatabase.cpp
	src/sql/kernel/qsqldriver.cpp

1 files changed, 3 insertions, 14 deletions

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 9d8625c..27ee6d8 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -134,7 +134,7 @@ extern "C" {
 #  include <errno.h>
 #endif
 
-#if defined(Q_OS_BSD4) || _POSIX_VERSION+0 < 200112L
+#if _POSIX_VERSION+0 < 200112L && !defined(Q_OS_BSD4)
 # define QT_NO_UNSETENV
 #endif
 
@@ -1767,7 +1767,7 @@ void qt_init(QApplicationPrivate *priv, int,
         X11->pattern_fills[i].screen = -1;
 #endif
 
-    X11->startupId = X11->originalStartupId = X11->startupIdString = 0;
+    X11->startupId = 0;
 
     int argc = priv->argc;
     char **argv = priv->argv;
@@ -2565,15 +2565,13 @@ void qt_init(QApplicationPrivate *priv, int,
 #endif // QT_NO_TABLET
 
         X11->startupId = getenv("DESKTOP_STARTUP_ID");
-        X11->originalStartupId = X11->startupId;
         if (X11->startupId) {
 #ifndef QT_NO_UNSETENV
             unsetenv("DESKTOP_STARTUP_ID");
 #else
             // it's a small memory leak, however we won't crash if Qt is
             // unloaded and someones tries to use the envoriment.
-            X11->startupIdString = strdup("DESKTOP_STARTUP_ID=");
-            putenv(X11->startupIdString);
+            putenv(strdup("DESKTOP_STARTUP_ID="));
 #endif
         }
    } else {
@@ -2707,15 +2705,6 @@ void qt_cleanup()
 #endif
     }
 
-#ifdef QT_NO_UNSETENV
-    // restore original value back.
-    if (X11->originalStartupId && X11->startupIdString) {
-        putenv(X11->originalStartupId);
-        free(X11->startupIdString);
-        X11->startupIdString = 0;
-    }
-#endif
-
 #ifndef QT_NO_XRENDER
     for (int i = 0; i < X11->solid_fill_count; ++i) {
         if (X11->solid_fills[i].picture)