Fix qmake build of unittests

This basically continues / amends work done
with e1c88116b3.

Change-Id: Ia8b3a4694e7fea4c15e344839f87c11fbe8fbbf4
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

src/plugins/coreplugin/corepluginunittestfiles.pri

@@ -2,12 +2,10 @@ DEFINES += CORE_STATIC_LIBRARY
 
 HEADERS += \
     $$PWD/coreicons.h \
-    $$PWD/id.h \
     $$PWD/find/ifindfilter.h \
     $$PWD/locator/ilocatorfilter.h
 
 SOURCES += \
     $$PWD/coreicons.cpp \
-    $$PWD/id.cpp \
     $$PWD/find/ifindfilter.cpp \
     $$PWD/locator/ilocatorfilter.cpp

src/plugins/coreplugin/icontext.h

@@ -27,7 +27,8 @@
 
 #include "core_global.h"
 #include "helpitem.h"
-#include "id.h"
+
+#include <utils/id.h>
 
 #include <QList>
 #include <QObject>