Merge remote-tracking branch 'origin/3.1'
Conflicts: src/plugins/winrt/winrtruncontrol.cpp src/plugins/winrt/winrtruncontrol.h Change-Id: Idad0558e53e23debee8523586b681af4705e97f6
No related branches found
No related tags found
Showing
- share/qtcreator/translations/qtcreator_cs.ts 4197 additions, 199 deletionsshare/qtcreator/translations/qtcreator_cs.ts
- src/plugins/qbsprojectmanager/qbsprojectmanager.qbs 5 additions, 9 deletionssrc/plugins/qbsprojectmanager/qbsprojectmanager.qbs
- src/plugins/winrt/winrtdevicefactory.cpp 24 additions, 2 deletionssrc/plugins/winrt/winrtdevicefactory.cpp
- src/plugins/winrt/winrtpackagedeploymentstep.cpp 6 additions, 6 deletionssrc/plugins/winrt/winrtpackagedeploymentstep.cpp
- src/plugins/winrt/winrtpackagedeploymentstep.h 0 additions, 1 deletionsrc/plugins/winrt/winrtpackagedeploymentstep.h
- src/plugins/winrt/winrtrunnerhelper.cpp 0 additions, 3 deletionssrc/plugins/winrt/winrtrunnerhelper.cpp
- src/plugins/winrt/winrtrunnerhelper.h 0 additions, 1 deletionsrc/plugins/winrt/winrtrunnerhelper.h
- src/shared/proparser/qmakeevaluator.cpp 10 additions, 10 deletionssrc/shared/proparser/qmakeevaluator.cpp
- src/shared/proparser/qmakeevaluator.h 1 addition, 1 deletionsrc/shared/proparser/qmakeevaluator.h
Loading
Please register or sign in to comment