Merge remote-tracking branch 'origin/2.6'
Showing
- dist/changes-2.6.0 2 additions, 1 deletiondist/changes-2.6.0
- doc/doc.pri 2 additions, 1 deletiondoc/doc.pri
- doc/src/howto/qtcreator-faq.qdoc 2 additions, 10 deletionsdoc/src/howto/qtcreator-faq.qdoc
- scripts/deployqtHelper_mac.sh 2 additions, 1 deletionscripts/deployqtHelper_mac.sh
- share/qtcreator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml 3 additions, 0 deletions...reator/templates/wizards/bb-qt5-guiapp/bar-descriptor.xml
- share/qtcreator/templates/wizards/bb-qt5-guiapp/wizard.xml 1 addition, 1 deletionshare/qtcreator/templates/wizards/bb-qt5-guiapp/wizard.xml
- share/qtcreator/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml 3 additions, 0 deletions...tor/templates/wizards/bb-qt5-quick2app/bar-descriptor.xml
- share/qtcreator/templates/wizards/bb-qt5-quick2app/wizard.xml 1 addition, 1 deletion...e/qtcreator/templates/wizards/bb-qt5-quick2app/wizard.xml
- share/qtcreator/translations/qtcreator_zh_TW.ts 44631 additions, 0 deletionsshare/qtcreator/translations/qtcreator_zh_TW.ts
- src/libs/cplusplus/LookupContext.cpp 40 additions, 4 deletionssrc/libs/cplusplus/LookupContext.cpp
- src/libs/cplusplus/LookupContext.h 4 additions, 0 deletionssrc/libs/cplusplus/LookupContext.h
- src/libs/cplusplus/ResolveExpression.cpp 28 additions, 7 deletionssrc/libs/cplusplus/ResolveExpression.cpp
- src/libs/cplusplus/cplusplus.pro 1 addition, 0 deletionssrc/libs/cplusplus/cplusplus.pro
- src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp 1 addition, 0 deletionssrc/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
- src/plugins/coreplugin/macfullscreen.mm 6 additions, 12 deletionssrc/plugins/coreplugin/macfullscreen.mm
- src/plugins/cpptools/cppcompletion_test.cpp 70 additions, 0 deletionssrc/plugins/cpptools/cppcompletion_test.cpp
- src/plugins/cpptools/cpptoolsplugin.h 2 additions, 1 deletionsrc/plugins/cpptools/cpptoolsplugin.h
- src/plugins/help/help.pro 1 addition, 1 deletionsrc/plugins/help/help.pro
- src/plugins/help/helpviewer_qwv.cpp 0 additions, 2 deletionssrc/plugins/help/helpviewer_qwv.cpp
- src/plugins/projectexplorer/kitinformation.cpp 18 additions, 0 deletionssrc/plugins/projectexplorer/kitinformation.cpp
Loading
Please register or sign in to comment