From fbca39aefd2270443f5ecf3b642d6cb4ace3b168 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 21 Feb 2011 11:44:34 +0100 Subject: [PATCH] QmlJsDebug: Fix compilation on Linux, Mac Use camel case for library name all over the place. --- share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro | 4 ++-- share/qtcreator/qml/qmlobserver/qmlobserver.pro | 4 ++-- src/plugins/qt4projectmanager/qmldebugginglibrary.cpp | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro index 34d687f9b8..db7fc2c6e2 100644 --- a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro +++ b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro @@ -12,9 +12,9 @@ DEFINES += BUILD_QMLJSDEBUGGER_STATIC_LIB unix:QMAKE_CXXFLAGS_DEBUG += -O3 DESTDIR = $$PWD -TARGET=qmljsdebugger +TARGET=QmlJSDebugger CONFIG(debug, debug|release) { - windows:TARGET=qmljsdebuggerd + windows:TARGET=QmlJSDebuggerd } # JS Debugging diff --git a/share/qtcreator/qml/qmlobserver/qmlobserver.pro b/share/qtcreator/qml/qmlobserver/qmlobserver.pro index b442d95796..6cccc3e29e 100644 --- a/share/qtcreator/qml/qmlobserver/qmlobserver.pro +++ b/share/qtcreator/qml/qmlobserver/qmlobserver.pro @@ -8,9 +8,9 @@ SOURCES += main.cpp # INCLUDEPATH and library path has to be extended by qmake call -DEBUGLIB=qmljsdebugger +DEBUGLIB=QmlJSDebugger CONFIG(debug, debug|release) { - windows:DEBUGLIB = qmljsdebuggerd + windows:DEBUGLIB = QmlJSDebuggerd } LIBS+=-l$$DEBUGLIB diff --git a/src/plugins/qt4projectmanager/qmldebugginglibrary.cpp b/src/plugins/qt4projectmanager/qmldebugginglibrary.cpp index ff38b50f52..0e5ce3e92a 100644 --- a/src/plugins/qt4projectmanager/qmldebugginglibrary.cpp +++ b/src/plugins/qt4projectmanager/qmldebugginglibrary.cpp @@ -56,12 +56,12 @@ QString QmlDebuggingLibrary::libraryByInstallData(const QString &qtInstallData, QStringList binFilenames; if (debugBuild) { - binFilenames << QLatin1String("qmljsdebuggerd.lib"); - binFilenames << QLatin1String("libqmljsdebuggerd.a"); // mingw + binFilenames << QLatin1String("QmlJSDebuggerd.lib"); + binFilenames << QLatin1String("libQmlJSDebuggerd.a"); // mingw } else { - binFilenames << QLatin1String("qmljsdebugger.lib"); + binFilenames << QLatin1String("QmlJSDebugger.lib"); } - binFilenames << QLatin1String("libqmljsdebugger.a"); + binFilenames << QLatin1String("libQmlJSDebugger.a"); return byInstallDataHelper(sourcePath(), sourceFileNames(), directories, binFilenames); } -- GitLab