OSDN Git Service

Add missing baseEnvironmentChanged signal
authorDaniel Teske <daniel.teske@nokia.com>
Tue, 4 Oct 2011 10:29:36 +0000 (12:29 +0200)
committerDaniel Teske <daniel.teske@nokia.com>
Tue, 4 Oct 2011 14:27:11 +0000 (16:27 +0200)
The base environment depends on *all* library pro files.
Do emit baseEnvironmentChanged accordingly.

Change-Id: Ia24f3d65492fbe7d2bb4f9fa9e46202ae1764213
Reviewed-on: http://codereview.qt-project.org/5991
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp

index e439b70..a233df6 100644 (file)
@@ -153,8 +153,14 @@ QString Qt4RunConfiguration::disabledReason() const
 
 void Qt4RunConfiguration::proFileUpdated(Qt4ProjectManager::Qt4ProFileNode *pro, bool success, bool parseInProgress)
 {
-    if (m_proFilePath != pro->path())
+    if (m_proFilePath != pro->path()) {
+        if (!parseInProgress) {
+            // We depend on all .pro files for the LD_LIBRARY_PATH so we emit a signal for all .pro files
+            // This can be optimized by checking whether LD_LIBRARY_PATH changed
+            emit baseEnvironmentChanged();
+        }
         return;
+    }
 
     bool enabled = isEnabled();
     m_parseSuccess = success;