Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qt-creator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Tobias Hunger
qt-creator
Commits
3e080e08
Commit
3e080e08
authored
14 years ago
by
Kai Koehne
Browse files
Options
Downloads
Patches
Plain Diff
QmlJSDebugger: Check for Qt 4.7.1 or newer before enabling qml debugging
Reviewed-by: Christiaan Janssen
parent
6929d66f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
+33
-4
33 additions, 4 deletions
...ates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
with
33 additions
and
4 deletions
share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
+
33
−
4
View file @
3e080e08
...
@@ -10,16 +10,45 @@ INCLUDEPATH += $$PWD
...
@@ -10,16 +10,45 @@ INCLUDEPATH += $$PWD
contains(DEFINES, QMLOBSERVER) {
contains(DEFINES, QMLOBSERVER) {
DEFINES *= QMLJSDEBUGGER
DEFINES *= QMLJSDEBUGGER
}
}
defineTest(minQtVersion) {
maj = $$1
min = $$2
patch = $$3
isEqual(QT_MAJOR_VERSION, $$maj) {
isEqual(QT_MINOR_VERSION, $$min) {
isEqual(QT_PATCH_VERSION, $$patch) {
return(true)
}
greaterThan(QT_PATCH_VERSION, $$patch) {
return(true)
}
}
greaterThan(QT_MINOR_VERSION, $$min) {
return(true)
}
}
return(false)
}
contains(DEFINES, QMLJSDEBUGGER) {
contains(DEFINES, QMLJSDEBUGGER) {
CONFIG(debug, debug|release) {
CONFIG(debug, debug|release) {
!minQtVersion(4, 7, 1) {
warning()
warning("Debugging QML requires the qmljsdebugger library that ships with Qt Creator.")
warning("This library requires Qt 4.7.1 or newer.")
warning()
error("Qt version $$QT_VERSION too old for QmlJS Debugging. Aborting.")
}
isEmpty(QMLJSDEBUGGER_PATH) {
isEmpty(QMLJSDEBUGGER_PATH) {
warning()
warning()
warning(Debugging QML requires the qmljsdebugger library that ships with Qt Creator.)
warning(
"
Debugging QML requires the qmljsdebugger library that ships with Qt Creator.
"
)
warning(Please specify its location on the qmake command line, e
.g.
)
warning(
"
Please specify its location on the qmake command line, e
g"
)
warning( qmake -r QMLJSDEBUGGER_PATH=$CREATORDIR/share/qtcreator/
qml/
qmljsdebugger)
warning(
"
qmake -r QMLJSDEBUGGER_PATH=$CREATORDIR/share/qtcreator/qmljsdebugger
"
)
warning()
warning()
error(QMLJSDEBUGGER defined, but no QMLJSDEBUGGER_PATH set on command line. Aborting.)
error(
"
QMLJSDEBUGGER defined, but no QMLJSDEBUGGER_PATH set on command line. Aborting.
"
)
DEFINES -= QMLJSDEBUGGER
DEFINES -= QMLJSDEBUGGER
} else {
} else {
include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment