Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
5b4a85df
Commit
5b4a85df
authored
Aug 04, 2010
by
Lasse Holmstedt
Browse files
QML Observer: reverted hack, fixed compilation for ibmake
see
576642a7
for details
parent
719b7757
Changes
4
Hide whitespace changes
Inline
Side-by-side
qtcreator.pri
View file @
5b4a85df
...
...
@@ -15,6 +15,19 @@ defineReplace(targetPath) {
return($$replace(1, /, $$QMAKE_DIR_SEP))
}
defineReplace(qtLibraryName) {
unset(LIBRARY_NAME)
LIBRARY_NAME = $$1
CONFIG(debug, debug|release) {
!debug_and_release|build_pass {
mac:RET = $$member(LIBRARY_NAME, 0)_debug
else:win32:RET = $$member(LIBRARY_NAME, 0)d
}
}
isEmpty(RET):RET = $$LIBRARY_NAME
return($$RET)
}
# For use in custom compilers which just copy files
win32:i_flag = i
defineReplace(stripSrcDir) {
...
...
src/libs/qmljsdebugger/qmljsdebugger.pri
View file @
5b4a85df
...
...
@@ -2,4 +2,4 @@ INCLUDEPATH += $$PWD/include
DEPENDPATH += $$PWD $$PWD/include $$PWD/editor
QT += declarative script
LIBS *= -l$$qtLibrary
Target
(QmlJSDebugger)
LIBS *= -l$$qtLibrary
Name
(QmlJSDebugger)
src/libs/utils/utils.pri
View file @
5b4a85df
LIBS *= -l$$qtLibrary
Target
(Utils)
LIBS *= -l$$qtLibrary
Name
(Utils)
src/tools/qml/qmlobserver/qmlobserver.pro
View file @
5b4a85df
...
...
@@ -4,18 +4,16 @@ QT += declarative
include
(
qml
.
pri
)
SOURCES
+=
main
.
cpp
include
(..
/../../../
qtcreator
.
pri
)
#
hack
to
get
qtLibraryTarget
macro
working
TEMPLATE
+=
lib
include
(..
/../../
libs
/
qmljsdebugger
/
qmljsdebugger
.
pri
)
include
(..
/../../
libs
/
utils
/
utils
.
pri
)
mac
{
qmljsLibraryTarget
=
$$
qtLibrary
Target
(
QmlJSDebugger
)
utilsLibraryTarget
=
$$
qtLibrary
Target
(
Utils
)
qmljsLibraryTarget
=
$$
qtLibrary
Name
(
QmlJSDebugger
)
utilsLibraryTarget
=
$$
qtLibrary
Name
(
Utils
)
}
TEMPLATE
-=
lib
include
(..
/../../../
qtcreator
.
pri
)
include
(..
/../../
private_headers
.
pri
)
DESTDIR
=
$$
IDE_BIN_PATH
include
(..
/../../
rpath
.
pri
)
...
...
Write
Preview
Supports
Markdown
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