feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Revert "Merge remote-tracking branch 'origin/4.15'"

Browse Source 
This reverts commit 888ca0dd20.

Reason for revert: wrong patchset

Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2021-05-06 15:27:51 +00:00
committed by Tim Jenssen
parent 53c0b82a93
commit f0a86d4510
42 changed files with 335 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlpreview/qmldebugtranslationclient.cpp
View File

@@ -26,8 +26,6 @@
#include "qmldebugtranslationclient.h"
#include <qmldebug/qpacketprotocol.h>
#include <QUrl>
#ifdef FOUND_QML_DEBUG_TRANSLATION_PROTOCOL
#include <private/qqmldebugtranslationprotocol_p.h>
#endif