Merge remote-tracking branch 'origin/2.4'

dist/changes-2.4.1

@@ -0,0 +1,47 @@
+Qt Creator version 2.4.1 contains bug fixes on top of 2.4.
+
+The most important changes are listed in this document. For a complete
+list of changes, see the Git log for the Qt Creator sources that
+you can check out from the public Git repository. For example:
+
+git clone git://gitorious.org/qt-creator/qt-creator.git
+git log --cherry-pick --pretty=oneline v2.4.0..origin/2.4
+
+General
+
+Editing
+
+Managing Projects
+
+Debugging
+
+Debugging QML/JS
+
+Analyzing Code
+
+C++ Support
+
+QML/JS Support
+  * Search qmlplugindump (4.8) in right location (QTCREATORBUG-6698)
+
+Qt Quick Designer
+
+Help
+
+Platform Specific
+
+Mac
+
+Linux (GNOME and KDE)
+
+Windows
+
+Symbian Target
+
+Remote Linux Support
+
+Qt Designer
+
+FakeVim
+
+Version control plugins

src/libs/qtcreatorcdbext/qtcreatorcdbext.pro

@@ -31,18 +31,19 @@ ENV_CPU=$$(CPU)
 ENV_LIBPATH=$$(LIBPATH)
 
 contains(ENV_CPU, ^AMD64$) {
-    DESTDIR=$$IDE_BASE_PATH/lib/$${BASENAME}64
+    DIRNAME=$${BASENAME}64
     CDB_PLATFORM=amd64
 } else:isEmpty(ENV_CPU):contains(ENV_LIBPATH, ^.*amd64.*$) {
-    DESTDIR=$$IDE_BASE_PATH/lib/$${BASENAME}64
+    DIRNAME=$${BASENAME}64
     CDB_PLATFORM=amd64
 } else {
-    DESTDIR=$$IDE_BASE_PATH/lib/$${BASENAME}32
+    DIRNAME=$${BASENAME}32
     CDB_PLATFORM=i386
 }
 
 LIBS+=-luser32
 
+DESTDIR=$$IDE_BASE_PATH/lib/$${DIRNAME}
 TARGET = $$BASENAME
 
 message("Compiling Qt Creator CDB extension $$TARGET $$DESTDIR for $$CDB_PLATFORM using $$CDB_PATH")
@@ -80,3 +81,7 @@ HEADERS += extensioncontext.h \
     containers.h \
     knowntype.h \
     symbolgroupnode.h
+
+target.path = /lib/$${DIRNAME}
+
+INSTALLS += target

src/plugins/qtsupport/baseqtversion.cpp

@@ -751,14 +751,15 @@ void BaseQtVersion::updateVersionInfo() const
 
     if (m_versionInfo.contains("QT_INSTALL_DATA")) {
         QString qtInstallData = m_versionInfo.value("QT_INSTALL_DATA");
+        QString qtInstallBins = m_versionInfo.value("QT_INSTALL_BINS");
         QString qtHeaderData = m_versionInfo.value("QT_INSTALL_HEADERS");
         m_versionInfo.insert("QMAKE_MKSPECS", QDir::cleanPath(qtInstallData+"/mkspecs"));
 
         if (!qtInstallData.isEmpty()) {
             m_hasDebuggingHelper = !ProjectExplorer::DebuggingHelperLibrary::debuggingHelperLibraryByInstallData(qtInstallData).isEmpty();
             m_hasQmlDump
-                    = !QmlDumpTool::toolByInstallData(qtInstallData, qtHeaderData, false).isEmpty()
-                    || !QmlDumpTool::toolByInstallData(qtInstallData, qtHeaderData, true).isEmpty();
+                    = !QmlDumpTool::toolForQtPaths(qtInstallData, qtInstallBins, qtHeaderData, false).isEmpty()
+                    || !QmlDumpTool::toolForQtPaths(qtInstallData, qtInstallBins, qtHeaderData, true).isEmpty();
             m_hasQmlDebuggingLibrary
                     = !QmlDebuggingLibrary::libraryByInstallData(qtInstallData, false).isEmpty()
                 || !QmlDebuggingLibrary::libraryByInstallData(qtInstallData, true).isEmpty();
@@ -927,10 +928,11 @@ QString BaseQtVersion::gdbDebuggingHelperLibrary() const
 QString BaseQtVersion::qmlDumpTool(bool debugVersion) const
 {
     QString qtInstallData = versionInfo().value("QT_INSTALL_DATA");
+    QString qtInstallBins = versionInfo().value("QT_INSTALL_BINS");
     QString qtHeaderData = versionInfo().value("QT_INSTALL_HEADERS");
     if (qtInstallData.isEmpty())
         return QString();
-    return QmlDumpTool::toolByInstallData(qtInstallData, qtHeaderData, debugVersion);
+    return QmlDumpTool::toolForQtPaths(qtInstallData, qtInstallBins, qtHeaderData, debugVersion);
 }
 
 QString BaseQtVersion::qmlDebuggingHelperLibrary(bool debugVersion) const

src/plugins/qtsupport/qmldumptool.cpp

@@ -228,8 +228,9 @@ QString QmlDumpTool::toolForVersion(BaseQtVersion *version, bool debugDump)
 {
     if (version) {
         QString qtInstallData = version->versionInfo().value("QT_INSTALL_DATA");
+        QString qtInstallBins = version->versionInfo().value("QT_INSTALL_BINS");
         QString qtInstallHeaders = version->versionInfo().value("QT_INSTALL_HEADERS");
-        QString toolPath = toolByInstallData(qtInstallData, qtInstallHeaders, debugDump);
+        QString toolPath = toolForQtPaths(qtInstallData, qtInstallBins, qtInstallHeaders, debugDump);
         return toolPath;
     }
 
@@ -253,7 +254,9 @@ static QStringList sourceFileNames()
     return files;
 }
 
-QString QmlDumpTool::toolByInstallData(const QString &qtInstallData, const QString &qtInstallHeaders,
+QString QmlDumpTool::toolForQtPaths(const QString &qtInstallData,
+                                       const QString &qtInstallBins,
+                                       const QString &qtInstallHeaders,
                                        bool debugDump)
 {
     if (!Core::ICore::instance())
@@ -261,7 +264,7 @@ QString QmlDumpTool::toolByInstallData(const QString &qtInstallData, const QStri
 
     // check for prebuilt binary first
     QFileInfo fileInfo;
-    if (getHelperFileInfoFor(validPrebuiltFilenames(debugDump), qtInstallData + QLatin1String("/bin/"), &fileInfo))
+    if (getHelperFileInfoFor(validPrebuiltFilenames(debugDump), qtInstallBins + QLatin1Char('/'), &fileInfo))
         return fileInfo.absoluteFilePath();
 
     const QStringList directories = installDirectories(qtInstallData);

src/plugins/qtsupport/qmldumptool.h

@@ -54,7 +54,9 @@ class QTSUPPORT_EXPORT QmlDumpTool : public Utils::BuildableHelperLibrary
 public:
     static bool canBuild(const BaseQtVersion *qtVersion, QString *reason = 0);
     static QString toolForVersion(BaseQtVersion *version, bool debugDump);
-    static QString toolByInstallData(const QString &qtInstallData, const QString &qtInstallHeaders,
+    static QString toolForQtPaths(const QString &qtInstallData,
+                                 const QString &qtInstallBins,
+                                 const QString &qtInstallHeaders,
                                  bool debugDump);
     static QStringList locationsByInstallData(const QString &qtInstallData, bool debugDump);
 

src/plugins/updateinfo/updateinfoplugin.cpp

@@ -110,6 +110,7 @@ void UpdateInfoPlugin::startCheckTimer(uint milliseconds)
 void UpdateInfoPlugin::stopCurrentCheckTimer()
 {
     killTimer(d->currentTimerId);
+    d->currentTimerId = 0;
 }
 
 

src/tools/qmlprofilertool/qmlprofilertool.pro

@@ -23,5 +23,6 @@ HEADERS += \
     commandlistener.h \
     constants.h
 
-
+target.path=/bin
+INSTALLS+=target
 

src/tools/qtcdebugger/qtcdebugger.pro

@@ -5,3 +5,6 @@ TEMPLATE = app
 SOURCES += main.cpp
 
 DESTDIR=../../../bin
+
+target.path=/bin
+INSTALLS+=target