Merge remote-tracking branch 'origin/4.4'
Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri src/libs/utils/utils-lib.pri src/plugins/clangcodemodel/clangbackendipcintegration.h src/shared/qbs Change-Id: I240e89afc76d8f40ce69d66683014b603f714707
No related branches found
No related tags found
Showing
- doc/src/analyze/qtquick-profiler.qdoc 2 additions, 2 deletionsdoc/src/analyze/qtquick-profiler.qdoc
- doc/src/debugger/creator-debugger-setup.qdoc 1 addition, 1 deletiondoc/src/debugger/creator-debugger-setup.qdoc
- doc/src/debugger/creator-debugger.qdoc 8 additions, 3 deletionsdoc/src/debugger/creator-debugger.qdoc
- doc/src/debugger/qtquick-debugging.qdoc 2 additions, 2 deletionsdoc/src/debugger/qtquick-debugging.qdoc
- doc/src/howto/creator-tips.qdoc 1 addition, 0 deletionsdoc/src/howto/creator-tips.qdoc
- doc/src/howto/creator-ui.qdoc 1 addition, 1 deletiondoc/src/howto/creator-ui.qdoc
- doc/src/overview/creator-advanced.qdoc 1 addition, 1 deletiondoc/src/overview/creator-advanced.qdoc
- doc/src/overview/creator-configuring.qdoc 4 additions, 3 deletionsdoc/src/overview/creator-configuring.qdoc
- doc/src/overview/creator-deployment-overview.qdoc 2 additions, 2 deletionsdoc/src/overview/creator-deployment-overview.qdoc
- doc/src/overview/creator-glossary.qdoc 13 additions, 6 deletionsdoc/src/overview/creator-glossary.qdoc
- doc/src/overview/creator-mobile-targets.qdoc 5 additions, 11 deletionsdoc/src/overview/creator-mobile-targets.qdoc
- doc/src/overview/creator-overview.qdoc 2 additions, 2 deletionsdoc/src/overview/creator-overview.qdoc
- doc/src/overview/creator-tech-support.qdoc 1 addition, 2 deletionsdoc/src/overview/creator-tech-support.qdoc
- doc/src/overview/creator-testing.qdoc 1 addition, 1 deletiondoc/src/overview/creator-testing.qdoc
- doc/src/projects/creator-projects-building-running.qdoc 7 additions, 7 deletionsdoc/src/projects/creator-projects-building-running.qdoc
- doc/src/projects/creator-projects-building.qdoc 2 additions, 3 deletionsdoc/src/projects/creator-projects-building.qdoc
- doc/src/projects/creator-projects-builds-customizing.qdoc 1 addition, 1 deletiondoc/src/projects/creator-projects-builds-customizing.qdoc
- doc/src/projects/creator-projects-creating.qdoc 1 addition, 1 deletiondoc/src/projects/creator-projects-creating.qdoc
- doc/src/projects/creator-projects-qt-versions.qdoc 3 additions, 3 deletionsdoc/src/projects/creator-projects-qt-versions.qdoc
- doc/src/projects/creator-projects-running.qdoc 1 addition, 1 deletiondoc/src/projects/creator-projects-running.qdoc
Loading
Please register or sign in to comment