Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qt-creator
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

345ea030

Commit 345ea030 authored Jul 10, 2017 by Eike Ziller

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/4.3' into 4.4

 Conflicts:
	qtcreator.qbs

Change-Id: Ic5e268326d93172208de291d31a716e437b9cedf

parents 491ab37b 41965347

Branches

Tags

No related merge requests found

Changes 9

Show whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 1 deletion

README.md
doc/src/overview/creator-supported-platforms.qdoc 1 addition, 1 deletion

doc/src/overview/creator-supported-platforms.qdoc
qbs/imports/QtcProduct.qbs 2 additions, 0 deletions

qbs/imports/QtcProduct.qbs
qtcreator.qbs 1 addition, 1 deletion

qtcreator.qbs
src/app/Info.plist 1 addition, 1 deletion

src/app/Info.plist
src/app/app.pro 6 additions, 1 deletion

src/app/app.pro
src/app/app.qbs 3 additions, 8 deletions

src/app/app.qbs
src/libs/cplusplus/LookupContext.cpp 12 additions, 8 deletions

src/libs/cplusplus/LookupContext.cpp
src/libs/cplusplus/LookupContext.h 2 additions, 1 deletion

src/libs/cplusplus/LookupContext.h

with 29 additions and 22 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment