Skip to content
  • Liang Qi's avatar
    Merge remote-tracking branch 'origin/5.15' into dev · a503bf54
    Liang Qi authored
     Conflicts:
    	src/corelib/tools/qvector.h
    		Make QVector(DataPointer dd) public to be able to properly merge
    		5b4b437b from 5.15 into dev.
    	src/widgets/kernel/qapplication.cpp
    	tests/auto/tools/moc/allmocs_baseline_in.json
    
    Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de>
    Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01
    a503bf54