• Eike Ziller's avatar
    Merge remote-tracking branch 'origin/3.0' · 851f255b
    Eike Ziller authored
    Conflicts:
    	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
    	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
    	src/plugins/qmlprofiler/qmlprofilertraceview.cpp
    
    Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
    851f255b
qmlprofilertraceview.cpp 18.7 KB