Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
fbca39ae
Commit
fbca39ae
authored
Feb 21, 2011
by
Kai Koehne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
QmlJsDebug: Fix compilation on Linux, Mac
Use camel case for library name all over the place.
parent
6a5eb677
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro
share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro
+2
-2
share/qtcreator/qml/qmlobserver/qmlobserver.pro
share/qtcreator/qml/qmlobserver/qmlobserver.pro
+2
-2
src/plugins/qt4projectmanager/qmldebugginglibrary.cpp
src/plugins/qt4projectmanager/qmldebugginglibrary.cpp
+4
-4
No files found.
share/qtcreator/qml/qmljsdebugger/qmljsdebugger.pro
View file @
fbca39ae
...
@@ -12,9 +12,9 @@ DEFINES += BUILD_QMLJSDEBUGGER_STATIC_LIB
...
@@ -12,9 +12,9 @@ DEFINES += BUILD_QMLJSDEBUGGER_STATIC_LIB
unix
:
QMAKE_CXXFLAGS_DEBUG
+=
-
O3
unix
:
QMAKE_CXXFLAGS_DEBUG
+=
-
O3
DESTDIR
=
$$
PWD
DESTDIR
=
$$
PWD
TARGET
=
q
ml
jsd
ebugger
TARGET
=
Q
ml
JSD
ebugger
CONFIG
(
debug
,
debug
|
release
)
{
CONFIG
(
debug
,
debug
|
release
)
{
windows
:
TARGET
=
q
ml
jsd
ebuggerd
windows
:
TARGET
=
Q
ml
JSD
ebuggerd
}
}
#
JS
Debugging
#
JS
Debugging
...
...
share/qtcreator/qml/qmlobserver/qmlobserver.pro
View file @
fbca39ae
...
@@ -8,9 +8,9 @@ SOURCES += main.cpp
...
@@ -8,9 +8,9 @@ SOURCES += main.cpp
#
INCLUDEPATH
and
library
path
has
to
be
extended
by
qmake
call
#
INCLUDEPATH
and
library
path
has
to
be
extended
by
qmake
call
DEBUGLIB
=
q
ml
jsd
ebugger
DEBUGLIB
=
Q
ml
JSD
ebugger
CONFIG
(
debug
,
debug
|
release
)
{
CONFIG
(
debug
,
debug
|
release
)
{
windows
:
DEBUGLIB
=
q
ml
jsd
ebuggerd
windows
:
DEBUGLIB
=
Q
ml
JSD
ebuggerd
}
}
LIBS
+=-
l
$$
DEBUGLIB
LIBS
+=-
l
$$
DEBUGLIB
...
...
src/plugins/qt4projectmanager/qmldebugginglibrary.cpp
View file @
fbca39ae
...
@@ -56,12 +56,12 @@ QString QmlDebuggingLibrary::libraryByInstallData(const QString &qtInstallData,
...
@@ -56,12 +56,12 @@ QString QmlDebuggingLibrary::libraryByInstallData(const QString &qtInstallData,
QStringList
binFilenames
;
QStringList
binFilenames
;
if
(
debugBuild
)
{
if
(
debugBuild
)
{
binFilenames
<<
QLatin1String
(
"
q
ml
jsd
ebuggerd.lib"
);
binFilenames
<<
QLatin1String
(
"
Q
ml
JSD
ebuggerd.lib"
);
binFilenames
<<
QLatin1String
(
"lib
q
ml
jsd
ebuggerd.a"
);
// mingw
binFilenames
<<
QLatin1String
(
"lib
Q
ml
JSD
ebuggerd.a"
);
// mingw
}
else
{
}
else
{
binFilenames
<<
QLatin1String
(
"
q
ml
jsd
ebugger.lib"
);
binFilenames
<<
QLatin1String
(
"
Q
ml
JSD
ebugger.lib"
);
}
}
binFilenames
<<
QLatin1String
(
"lib
q
ml
jsd
ebugger.a"
);
binFilenames
<<
QLatin1String
(
"lib
Q
ml
JSD
ebugger.a"
);
return
byInstallDataHelper
(
sourcePath
(),
sourceFileNames
(),
directories
,
binFilenames
);
return
byInstallDataHelper
(
sourcePath
(),
sourceFileNames
(),
directories
,
binFilenames
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment