diff options
author | Marco Bubke <marco.bubke@theqtcompany.com> | 2015-05-21 18:18:32 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-05-22 09:56:58 +0000 |
commit | 9c87f6965b450ba6eb1c09a9510e7408d580b19a (patch) | |
tree | 869cfa78f689f439eba52aefbbbd21544f875ed6 | |
parent | 15dcfd15648deac305463774c4aff26a23d1eb8d (diff) | |
download | qt-creator-9c87f6965b450ba6eb1c09a9510e7408d580b19a.tar.gz |
Move codemodelbackendipc source to project root
Change-Id: I948c29489e4951ddf46ec936fa667056a7fc61f0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
-rw-r--r-- | src/libs/codemodelbackendipc/cmbalivecommand.cpp (renamed from src/libs/codemodelbackendipc/source/cmbalivecommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbalivecommand.h (renamed from src/libs/codemodelbackendipc/source/cmbalivecommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbcodecompletedcommand.cpp (renamed from src/libs/codemodelbackendipc/source/cmbcodecompletedcommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbcodecompletedcommand.h (renamed from src/libs/codemodelbackendipc/source/cmbcodecompletedcommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbcommands.cpp (renamed from src/libs/codemodelbackendipc/source/cmbcommands.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbcommands.h (renamed from src/libs/codemodelbackendipc/source/cmbcommands.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbcompletecodecommand.cpp (renamed from src/libs/codemodelbackendipc/source/cmbcompletecodecommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbcompletecodecommand.h (renamed from src/libs/codemodelbackendipc/source/cmbcompletecodecommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbechocommand.cpp (renamed from src/libs/codemodelbackendipc/source/cmbechocommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbechocommand.h (renamed from src/libs/codemodelbackendipc/source/cmbechocommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbendcommand.cpp (renamed from src/libs/codemodelbackendipc/source/cmbendcommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbendcommand.h (renamed from src/libs/codemodelbackendipc/source/cmbendcommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp (renamed from src/libs/codemodelbackendipc/source/cmbregisterprojectsforcodecompletioncommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h (renamed from src/libs/codemodelbackendipc/source/cmbregisterprojectsforcodecompletioncommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp (renamed from src/libs/codemodelbackendipc/source/cmbregistertranslationunitsforcodecompletioncommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h (renamed from src/libs/codemodelbackendipc/source/cmbregistertranslationunitsforcodecompletioncommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp (renamed from src/libs/codemodelbackendipc/source/cmbunregisterprojectsforcodecompletioncommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.h (renamed from src/libs/codemodelbackendipc/source/cmbunregisterprojectsforcodecompletioncommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp (renamed from src/libs/codemodelbackendipc/source/cmbunregistertranslationunitsforcodecompletioncommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h (renamed from src/libs/codemodelbackendipc/source/cmbunregistertranslationunitsforcodecompletioncommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/codecompletion.cpp (renamed from src/libs/codemodelbackendipc/source/codecompletion.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/codecompletion.h (renamed from src/libs/codemodelbackendipc/source/codecompletion.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/codecompletionchunk.cpp (renamed from src/libs/codemodelbackendipc/source/codecompletionchunk.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/codecompletionchunk.h (renamed from src/libs/codemodelbackendipc/source/codecompletionchunk.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri | 61 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/codemodelbackendipc.qbs | 7 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri | 2 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/codemodelbackendipc_global.cpp (renamed from src/libs/codemodelbackendipc/source/codemodelbackendipc_global.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/codemodelbackendipc_global.h (renamed from src/libs/codemodelbackendipc/source/codemodelbackendipc_global.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/connectionclient.cpp (renamed from src/libs/codemodelbackendipc/source/connectionclient.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/connectionclient.h (renamed from src/libs/codemodelbackendipc/source/connectionclient.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/connectionserver.cpp (renamed from src/libs/codemodelbackendipc/source/connectionserver.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/connectionserver.h (renamed from src/libs/codemodelbackendipc/source/connectionserver.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/filecontainer.cpp (renamed from src/libs/codemodelbackendipc/source/filecontainer.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/filecontainer.h (renamed from src/libs/codemodelbackendipc/source/filecontainer.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcclientdispatcher.cpp (renamed from src/libs/codemodelbackendipc/source/ipcclientdispatcher.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcclientdispatcher.h (renamed from src/libs/codemodelbackendipc/source/ipcclientdispatcher.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcclientinterface.cpp (renamed from src/libs/codemodelbackendipc/source/ipcclientinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcclientinterface.h (renamed from src/libs/codemodelbackendipc/source/ipcclientinterface.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcclientproxy.cpp (renamed from src/libs/codemodelbackendipc/source/ipcclientproxy.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcclientproxy.h (renamed from src/libs/codemodelbackendipc/source/ipcclientproxy.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcinterface.cpp (renamed from src/libs/codemodelbackendipc/source/ipcinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcinterface.h (renamed from src/libs/codemodelbackendipc/source/ipcinterface.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcserver.cpp (renamed from src/libs/codemodelbackendipc/source/ipcserver.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcserver.h (renamed from src/libs/codemodelbackendipc/source/ipcserver.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcserverinterface.cpp (renamed from src/libs/codemodelbackendipc/source/ipcserverinterface.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcserverinterface.h (renamed from src/libs/codemodelbackendipc/source/ipcserverinterface.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcserverproxy.cpp (renamed from src/libs/codemodelbackendipc/source/ipcserverproxy.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/ipcserverproxy.h (renamed from src/libs/codemodelbackendipc/source/ipcserverproxy.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/projectpartcontainer.cpp (renamed from src/libs/codemodelbackendipc/source/projectpartcontainer.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/projectpartcontainer.h (renamed from src/libs/codemodelbackendipc/source/projectpartcontainer.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/projectpartsdonotexistcommand.cpp (renamed from src/libs/codemodelbackendipc/source/projectpartsdonotexistcommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/projectpartsdonotexistcommand.h (renamed from src/libs/codemodelbackendipc/source/projectpartsdonotexistcommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/readcommandblock.cpp (renamed from src/libs/codemodelbackendipc/source/readcommandblock.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/readcommandblock.h (renamed from src/libs/codemodelbackendipc/source/readcommandblock.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/source/codemodelbackendipc-source.pri | 66 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.cpp (renamed from src/libs/codemodelbackendipc/source/translationunitdoesnotexistcommand.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.h (renamed from src/libs/codemodelbackendipc/source/translationunitdoesnotexistcommand.h) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/writecommandblock.cpp (renamed from src/libs/codemodelbackendipc/source/writecommandblock.cpp) | 0 | ||||
-rw-r--r-- | src/libs/codemodelbackendipc/writecommandblock.h (renamed from src/libs/codemodelbackendipc/source/writecommandblock.h) | 0 | ||||
-rw-r--r-- | src/tools/codemodelbackend/codemodelbackend.pri | 2 |
61 files changed, 65 insertions, 73 deletions
diff --git a/src/libs/codemodelbackendipc/source/cmbalivecommand.cpp b/src/libs/codemodelbackendipc/cmbalivecommand.cpp index fbea35fd41..fbea35fd41 100644 --- a/src/libs/codemodelbackendipc/source/cmbalivecommand.cpp +++ b/src/libs/codemodelbackendipc/cmbalivecommand.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbalivecommand.h b/src/libs/codemodelbackendipc/cmbalivecommand.h index cdc015f685..cdc015f685 100644 --- a/src/libs/codemodelbackendipc/source/cmbalivecommand.h +++ b/src/libs/codemodelbackendipc/cmbalivecommand.h diff --git a/src/libs/codemodelbackendipc/source/cmbcodecompletedcommand.cpp b/src/libs/codemodelbackendipc/cmbcodecompletedcommand.cpp index 775a220797..775a220797 100644 --- a/src/libs/codemodelbackendipc/source/cmbcodecompletedcommand.cpp +++ b/src/libs/codemodelbackendipc/cmbcodecompletedcommand.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbcodecompletedcommand.h b/src/libs/codemodelbackendipc/cmbcodecompletedcommand.h index c37b237588..c37b237588 100644 --- a/src/libs/codemodelbackendipc/source/cmbcodecompletedcommand.h +++ b/src/libs/codemodelbackendipc/cmbcodecompletedcommand.h diff --git a/src/libs/codemodelbackendipc/source/cmbcommands.cpp b/src/libs/codemodelbackendipc/cmbcommands.cpp index 0edc3630d3..0edc3630d3 100644 --- a/src/libs/codemodelbackendipc/source/cmbcommands.cpp +++ b/src/libs/codemodelbackendipc/cmbcommands.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbcommands.h b/src/libs/codemodelbackendipc/cmbcommands.h index dacb200316..dacb200316 100644 --- a/src/libs/codemodelbackendipc/source/cmbcommands.h +++ b/src/libs/codemodelbackendipc/cmbcommands.h diff --git a/src/libs/codemodelbackendipc/source/cmbcompletecodecommand.cpp b/src/libs/codemodelbackendipc/cmbcompletecodecommand.cpp index dcb4e7f113..dcb4e7f113 100644 --- a/src/libs/codemodelbackendipc/source/cmbcompletecodecommand.cpp +++ b/src/libs/codemodelbackendipc/cmbcompletecodecommand.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbcompletecodecommand.h b/src/libs/codemodelbackendipc/cmbcompletecodecommand.h index 7cb30ccca9..7cb30ccca9 100644 --- a/src/libs/codemodelbackendipc/source/cmbcompletecodecommand.h +++ b/src/libs/codemodelbackendipc/cmbcompletecodecommand.h diff --git a/src/libs/codemodelbackendipc/source/cmbechocommand.cpp b/src/libs/codemodelbackendipc/cmbechocommand.cpp index 3d44a12ea3..3d44a12ea3 100644 --- a/src/libs/codemodelbackendipc/source/cmbechocommand.cpp +++ b/src/libs/codemodelbackendipc/cmbechocommand.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbechocommand.h b/src/libs/codemodelbackendipc/cmbechocommand.h index 7c3d491c52..7c3d491c52 100644 --- a/src/libs/codemodelbackendipc/source/cmbechocommand.h +++ b/src/libs/codemodelbackendipc/cmbechocommand.h diff --git a/src/libs/codemodelbackendipc/source/cmbendcommand.cpp b/src/libs/codemodelbackendipc/cmbendcommand.cpp index 874f954f85..874f954f85 100644 --- a/src/libs/codemodelbackendipc/source/cmbendcommand.cpp +++ b/src/libs/codemodelbackendipc/cmbendcommand.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbendcommand.h b/src/libs/codemodelbackendipc/cmbendcommand.h index 5d593942c5..5d593942c5 100644 --- a/src/libs/codemodelbackendipc/source/cmbendcommand.h +++ b/src/libs/codemodelbackendipc/cmbendcommand.h diff --git a/src/libs/codemodelbackendipc/source/cmbregisterprojectsforcodecompletioncommand.cpp b/src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp index c042a6749e..c042a6749e 100644 --- a/src/libs/codemodelbackendipc/source/cmbregisterprojectsforcodecompletioncommand.cpp +++ b/src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbregisterprojectsforcodecompletioncommand.h b/src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h index d1ffa784a5..d1ffa784a5 100644 --- a/src/libs/codemodelbackendipc/source/cmbregisterprojectsforcodecompletioncommand.h +++ b/src/libs/codemodelbackendipc/cmbregisterprojectsforcodecompletioncommand.h diff --git a/src/libs/codemodelbackendipc/source/cmbregistertranslationunitsforcodecompletioncommand.cpp b/src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp index b9519668fb..b9519668fb 100644 --- a/src/libs/codemodelbackendipc/source/cmbregistertranslationunitsforcodecompletioncommand.cpp +++ b/src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbregistertranslationunitsforcodecompletioncommand.h b/src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h index 1b15709a10..1b15709a10 100644 --- a/src/libs/codemodelbackendipc/source/cmbregistertranslationunitsforcodecompletioncommand.h +++ b/src/libs/codemodelbackendipc/cmbregistertranslationunitsforcodecompletioncommand.h diff --git a/src/libs/codemodelbackendipc/source/cmbunregisterprojectsforcodecompletioncommand.cpp b/src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp index 39d767f6b6..39d767f6b6 100644 --- a/src/libs/codemodelbackendipc/source/cmbunregisterprojectsforcodecompletioncommand.cpp +++ b/src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbunregisterprojectsforcodecompletioncommand.h b/src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.h index 0f63bdab89..0f63bdab89 100644 --- a/src/libs/codemodelbackendipc/source/cmbunregisterprojectsforcodecompletioncommand.h +++ b/src/libs/codemodelbackendipc/cmbunregisterprojectsforcodecompletioncommand.h diff --git a/src/libs/codemodelbackendipc/source/cmbunregistertranslationunitsforcodecompletioncommand.cpp b/src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp index 8db318aa48..8db318aa48 100644 --- a/src/libs/codemodelbackendipc/source/cmbunregistertranslationunitsforcodecompletioncommand.cpp +++ b/src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.cpp diff --git a/src/libs/codemodelbackendipc/source/cmbunregistertranslationunitsforcodecompletioncommand.h b/src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h index 01455e5c3a..01455e5c3a 100644 --- a/src/libs/codemodelbackendipc/source/cmbunregistertranslationunitsforcodecompletioncommand.h +++ b/src/libs/codemodelbackendipc/cmbunregistertranslationunitsforcodecompletioncommand.h diff --git a/src/libs/codemodelbackendipc/source/codecompletion.cpp b/src/libs/codemodelbackendipc/codecompletion.cpp index bb7ee0e626..bb7ee0e626 100644 --- a/src/libs/codemodelbackendipc/source/codecompletion.cpp +++ b/src/libs/codemodelbackendipc/codecompletion.cpp diff --git a/src/libs/codemodelbackendipc/source/codecompletion.h b/src/libs/codemodelbackendipc/codecompletion.h index f487a837cd..f487a837cd 100644 --- a/src/libs/codemodelbackendipc/source/codecompletion.h +++ b/src/libs/codemodelbackendipc/codecompletion.h diff --git a/src/libs/codemodelbackendipc/source/codecompletionchunk.cpp b/src/libs/codemodelbackendipc/codecompletionchunk.cpp index be0461704a..be0461704a 100644 --- a/src/libs/codemodelbackendipc/source/codecompletionchunk.cpp +++ b/src/libs/codemodelbackendipc/codecompletionchunk.cpp diff --git a/src/libs/codemodelbackendipc/source/codecompletionchunk.h b/src/libs/codemodelbackendipc/codecompletionchunk.h index 6a5fd4609c..6a5fd4609c 100644 --- a/src/libs/codemodelbackendipc/source/codecompletionchunk.h +++ b/src/libs/codemodelbackendipc/codecompletionchunk.h diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri b/src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri index 11b949a260..54068e45c1 100644 --- a/src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri +++ b/src/libs/codemodelbackendipc/codemodelbackendipc-lib.pri @@ -8,6 +8,65 @@ QT += network DEFINES += CODEMODELBACKENDIPC_LIBRARY -include(source/codemodelbackendipc-source.pri) +INCLUDEPATH += $$PWD + +SOURCES += $$PWD/ipcserverinterface.cpp \ + $$PWD/ipcserverproxy.cpp \ + $$PWD/ipcserver.cpp \ + $$PWD/ipcclientinterface.cpp \ + $$PWD/cmbendcommand.cpp \ + $$PWD/cmbalivecommand.cpp \ + $$PWD/ipcclientproxy.cpp \ + $$PWD/cmbcommands.cpp \ + $$PWD/writecommandblock.cpp \ + $$PWD/readcommandblock.cpp \ + $$PWD/ipcinterface.cpp \ + $$PWD/connectionserver.cpp \ + $$PWD/connectionclient.cpp \ + $$PWD/cmbechocommand.cpp \ + $$PWD/ipcclientdispatcher.cpp \ + $$PWD/cmbregistertranslationunitsforcodecompletioncommand.cpp \ + $$PWD/filecontainer.cpp \ + $$PWD/cmbunregistertranslationunitsforcodecompletioncommand.cpp \ + $$PWD/cmbcompletecodecommand.cpp \ + $$PWD/cmbcodecompletedcommand.cpp \ + $$PWD/codecompletion.cpp \ + $$PWD/codemodelbackendipc_global.cpp \ + $$PWD/cmbregisterprojectsforcodecompletioncommand.cpp \ + $$PWD/cmbunregisterprojectsforcodecompletioncommand.cpp \ + $$PWD/translationunitdoesnotexistcommand.cpp \ + $$PWD/codecompletionchunk.cpp \ + $$PWD/projectpartcontainer.cpp \ + $$PWD/projectpartsdonotexistcommand.cpp + + +HEADERS += $$PWD/codemodelbackendipc_global.h \ + $$PWD/ipcserverinterface.h \ + $$PWD/ipcserverproxy.h \ + $$PWD/ipcserver.h \ + $$PWD/ipcclientinterface.h \ + $$PWD/cmbendcommand.h \ + $$PWD/cmbalivecommand.h \ + $$PWD/ipcclientproxy.h \ + $$PWD/cmbcommands.h \ + $$PWD/writecommandblock.h \ + $$PWD/readcommandblock.h \ + $$PWD/ipcinterface.h \ + $$PWD/connectionserver.h \ + $$PWD/connectionclient.h \ + $$PWD/cmbechocommand.h \ + $$PWD/ipcclientdispatcher.h \ + $$PWD/cmbregistertranslationunitsforcodecompletioncommand.h \ + $$PWD/filecontainer.h \ + $$PWD/cmbunregistertranslationunitsforcodecompletioncommand.h \ + $$PWD/cmbcompletecodecommand.h \ + $$PWD/cmbcodecompletedcommand.h \ + $$PWD/codecompletion.h \ + $$PWD/cmbregisterprojectsforcodecompletioncommand.h \ + $$PWD/cmbunregisterprojectsforcodecompletioncommand.h \ + $$PWD/translationunitdoesnotexistcommand.h \ + $$PWD/codecompletionchunk.h \ + $$PWD/projectpartcontainer.h \ + $$PWD/projectpartsdonotexistcommand.h contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc.qbs b/src/libs/codemodelbackendipc/codemodelbackendipc.qbs index cb4a51bf19..7d08615586 100644 --- a/src/libs/codemodelbackendipc/codemodelbackendipc.qbs +++ b/src/libs/codemodelbackendipc/codemodelbackendipc.qbs @@ -1,4 +1,4 @@ -import qbs 1.0 +import qbs 1.0 QtcLibrary { name: "CodeModelBackEndIpc" @@ -7,10 +7,9 @@ QtcLibrary { Depends { name: "Sqlite" } cpp.defines: base.concat("CODEMODELBACKENDIPC_LIBRARY") - cpp.includePaths: base.concat("source") + cpp.includePaths: base.concat(".") Group { - prefix: "source/" files: [ "*.h", "*.cpp" @@ -21,7 +20,7 @@ QtcLibrary { Depends { name: "Sqlite" } Depends { name: "Qt.network" } cpp.includePaths: [ - "source" + "." ] } } diff --git a/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri b/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri index 3b6cea6cc0..98a3a2a5d9 100644 --- a/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri +++ b/src/libs/codemodelbackendipc/codemodelbackendipc_dependencies.pri @@ -1,3 +1,3 @@ QTC_LIB_NAME = Codemodelbackendipc QTC_LIB_DEPENDS += sqlite -INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc/source +INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc diff --git a/src/libs/codemodelbackendipc/source/codemodelbackendipc_global.cpp b/src/libs/codemodelbackendipc/codemodelbackendipc_global.cpp index 3cc21e5c03..3cc21e5c03 100644 --- a/src/libs/codemodelbackendipc/source/codemodelbackendipc_global.cpp +++ b/src/libs/codemodelbackendipc/codemodelbackendipc_global.cpp diff --git a/src/libs/codemodelbackendipc/source/codemodelbackendipc_global.h b/src/libs/codemodelbackendipc/codemodelbackendipc_global.h index ac6a24044c..ac6a24044c 100644 --- a/src/libs/codemodelbackendipc/source/codemodelbackendipc_global.h +++ b/src/libs/codemodelbackendipc/codemodelbackendipc_global.h diff --git a/src/libs/codemodelbackendipc/source/connectionclient.cpp b/src/libs/codemodelbackendipc/connectionclient.cpp index be1dce22bb..be1dce22bb 100644 --- a/src/libs/codemodelbackendipc/source/connectionclient.cpp +++ b/src/libs/codemodelbackendipc/connectionclient.cpp diff --git a/src/libs/codemodelbackendipc/source/connectionclient.h b/src/libs/codemodelbackendipc/connectionclient.h index e1128fc69a..e1128fc69a 100644 --- a/src/libs/codemodelbackendipc/source/connectionclient.h +++ b/src/libs/codemodelbackendipc/connectionclient.h diff --git a/src/libs/codemodelbackendipc/source/connectionserver.cpp b/src/libs/codemodelbackendipc/connectionserver.cpp index 6a3a872759..6a3a872759 100644 --- a/src/libs/codemodelbackendipc/source/connectionserver.cpp +++ b/src/libs/codemodelbackendipc/connectionserver.cpp diff --git a/src/libs/codemodelbackendipc/source/connectionserver.h b/src/libs/codemodelbackendipc/connectionserver.h index 471129e1cd..471129e1cd 100644 --- a/src/libs/codemodelbackendipc/source/connectionserver.h +++ b/src/libs/codemodelbackendipc/connectionserver.h diff --git a/src/libs/codemodelbackendipc/source/filecontainer.cpp b/src/libs/codemodelbackendipc/filecontainer.cpp index 39b7d85b71..39b7d85b71 100644 --- a/src/libs/codemodelbackendipc/source/filecontainer.cpp +++ b/src/libs/codemodelbackendipc/filecontainer.cpp diff --git a/src/libs/codemodelbackendipc/source/filecontainer.h b/src/libs/codemodelbackendipc/filecontainer.h index 6ead9441f8..6ead9441f8 100644 --- a/src/libs/codemodelbackendipc/source/filecontainer.h +++ b/src/libs/codemodelbackendipc/filecontainer.h diff --git a/src/libs/codemodelbackendipc/source/ipcclientdispatcher.cpp b/src/libs/codemodelbackendipc/ipcclientdispatcher.cpp index f29d9c5573..f29d9c5573 100644 --- a/src/libs/codemodelbackendipc/source/ipcclientdispatcher.cpp +++ b/src/libs/codemodelbackendipc/ipcclientdispatcher.cpp diff --git a/src/libs/codemodelbackendipc/source/ipcclientdispatcher.h b/src/libs/codemodelbackendipc/ipcclientdispatcher.h index 263341dfbd..263341dfbd 100644 --- a/src/libs/codemodelbackendipc/source/ipcclientdispatcher.h +++ b/src/libs/codemodelbackendipc/ipcclientdispatcher.h diff --git a/src/libs/codemodelbackendipc/source/ipcclientinterface.cpp b/src/libs/codemodelbackendipc/ipcclientinterface.cpp index f436d0b958..f436d0b958 100644 --- a/src/libs/codemodelbackendipc/source/ipcclientinterface.cpp +++ b/src/libs/codemodelbackendipc/ipcclientinterface.cpp diff --git a/src/libs/codemodelbackendipc/source/ipcclientinterface.h b/src/libs/codemodelbackendipc/ipcclientinterface.h index b9f5d8d449..b9f5d8d449 100644 --- a/src/libs/codemodelbackendipc/source/ipcclientinterface.h +++ b/src/libs/codemodelbackendipc/ipcclientinterface.h diff --git a/src/libs/codemodelbackendipc/source/ipcclientproxy.cpp b/src/libs/codemodelbackendipc/ipcclientproxy.cpp index 7e99572d91..7e99572d91 100644 --- a/src/libs/codemodelbackendipc/source/ipcclientproxy.cpp +++ b/src/libs/codemodelbackendipc/ipcclientproxy.cpp diff --git a/src/libs/codemodelbackendipc/source/ipcclientproxy.h b/src/libs/codemodelbackendipc/ipcclientproxy.h index 896b03f327..896b03f327 100644 --- a/src/libs/codemodelbackendipc/source/ipcclientproxy.h +++ b/src/libs/codemodelbackendipc/ipcclientproxy.h diff --git a/src/libs/codemodelbackendipc/source/ipcinterface.cpp b/src/libs/codemodelbackendipc/ipcinterface.cpp index f61c093c99..f61c093c99 100644 --- a/src/libs/codemodelbackendipc/source/ipcinterface.cpp +++ b/src/libs/codemodelbackendipc/ipcinterface.cpp diff --git a/src/libs/codemodelbackendipc/source/ipcinterface.h b/src/libs/codemodelbackendipc/ipcinterface.h index 61a2ca09df..61a2ca09df 100644 --- a/src/libs/codemodelbackendipc/source/ipcinterface.h +++ b/src/libs/codemodelbackendipc/ipcinterface.h diff --git a/src/libs/codemodelbackendipc/source/ipcserver.cpp b/src/libs/codemodelbackendipc/ipcserver.cpp index 43821c134e..43821c134e 100644 --- a/src/libs/codemodelbackendipc/source/ipcserver.cpp +++ b/src/libs/codemodelbackendipc/ipcserver.cpp diff --git a/src/libs/codemodelbackendipc/source/ipcserver.h b/src/libs/codemodelbackendipc/ipcserver.h index 090a23b754..090a23b754 100644 --- a/src/libs/codemodelbackendipc/source/ipcserver.h +++ b/src/libs/codemodelbackendipc/ipcserver.h diff --git a/src/libs/codemodelbackendipc/source/ipcserverinterface.cpp b/src/libs/codemodelbackendipc/ipcserverinterface.cpp index c3bcc9f8e4..c3bcc9f8e4 100644 --- a/src/libs/codemodelbackendipc/source/ipcserverinterface.cpp +++ b/src/libs/codemodelbackendipc/ipcserverinterface.cpp diff --git a/src/libs/codemodelbackendipc/source/ipcserverinterface.h b/src/libs/codemodelbackendipc/ipcserverinterface.h index 1b7410a0b8..1b7410a0b8 100644 --- a/src/libs/codemodelbackendipc/source/ipcserverinterface.h +++ b/src/libs/codemodelbackendipc/ipcserverinterface.h diff --git a/src/libs/codemodelbackendipc/source/ipcserverproxy.cpp b/src/libs/codemodelbackendipc/ipcserverproxy.cpp index fae81fc1f9..fae81fc1f9 100644 --- a/src/libs/codemodelbackendipc/source/ipcserverproxy.cpp +++ b/src/libs/codemodelbackendipc/ipcserverproxy.cpp diff --git a/src/libs/codemodelbackendipc/source/ipcserverproxy.h b/src/libs/codemodelbackendipc/ipcserverproxy.h index 02295de4bd..02295de4bd 100644 --- a/src/libs/codemodelbackendipc/source/ipcserverproxy.h +++ b/src/libs/codemodelbackendipc/ipcserverproxy.h diff --git a/src/libs/codemodelbackendipc/source/projectpartcontainer.cpp b/src/libs/codemodelbackendipc/projectpartcontainer.cpp index af4e1aa8cf..af4e1aa8cf 100644 --- a/src/libs/codemodelbackendipc/source/projectpartcontainer.cpp +++ b/src/libs/codemodelbackendipc/projectpartcontainer.cpp diff --git a/src/libs/codemodelbackendipc/source/projectpartcontainer.h b/src/libs/codemodelbackendipc/projectpartcontainer.h index 253074a371..253074a371 100644 --- a/src/libs/codemodelbackendipc/source/projectpartcontainer.h +++ b/src/libs/codemodelbackendipc/projectpartcontainer.h diff --git a/src/libs/codemodelbackendipc/source/projectpartsdonotexistcommand.cpp b/src/libs/codemodelbackendipc/projectpartsdonotexistcommand.cpp index 8a9cf6a322..8a9cf6a322 100644 --- a/src/libs/codemodelbackendipc/source/projectpartsdonotexistcommand.cpp +++ b/src/libs/codemodelbackendipc/projectpartsdonotexistcommand.cpp diff --git a/src/libs/codemodelbackendipc/source/projectpartsdonotexistcommand.h b/src/libs/codemodelbackendipc/projectpartsdonotexistcommand.h index 073d148881..073d148881 100644 --- a/src/libs/codemodelbackendipc/source/projectpartsdonotexistcommand.h +++ b/src/libs/codemodelbackendipc/projectpartsdonotexistcommand.h diff --git a/src/libs/codemodelbackendipc/source/readcommandblock.cpp b/src/libs/codemodelbackendipc/readcommandblock.cpp index 5d2224f1b3..5d2224f1b3 100644 --- a/src/libs/codemodelbackendipc/source/readcommandblock.cpp +++ b/src/libs/codemodelbackendipc/readcommandblock.cpp diff --git a/src/libs/codemodelbackendipc/source/readcommandblock.h b/src/libs/codemodelbackendipc/readcommandblock.h index 67b2128514..67b2128514 100644 --- a/src/libs/codemodelbackendipc/source/readcommandblock.h +++ b/src/libs/codemodelbackendipc/readcommandblock.h diff --git a/src/libs/codemodelbackendipc/source/codemodelbackendipc-source.pri b/src/libs/codemodelbackendipc/source/codemodelbackendipc-source.pri deleted file mode 100644 index 3db6f7ffa3..0000000000 --- a/src/libs/codemodelbackendipc/source/codemodelbackendipc-source.pri +++ /dev/null @@ -1,66 +0,0 @@ -#------------------------------------------------- -# -# ProjectPart created by QtCreator 2014-12-17T12:23:46 -# -#------------------------------------------------- - -INCLUDEPATH += $$PWD - -SOURCES += $$PWD/ipcserverinterface.cpp \ - $$PWD/ipcserverproxy.cpp \ - $$PWD/ipcserver.cpp \ - $$PWD/ipcclientinterface.cpp \ - $$PWD/cmbendcommand.cpp \ - $$PWD/cmbalivecommand.cpp \ - $$PWD/ipcclientproxy.cpp \ - $$PWD/cmbcommands.cpp \ - $$PWD/writecommandblock.cpp \ - $$PWD/readcommandblock.cpp \ - $$PWD/ipcinterface.cpp \ - $$PWD/connectionserver.cpp \ - $$PWD/connectionclient.cpp \ - $$PWD/cmbechocommand.cpp \ - $$PWD/ipcclientdispatcher.cpp \ - $$PWD/cmbregistertranslationunitsforcodecompletioncommand.cpp \ - $$PWD/filecontainer.cpp \ - $$PWD/cmbunregistertranslationunitsforcodecompletioncommand.cpp \ - $$PWD/cmbcompletecodecommand.cpp \ - $$PWD/cmbcodecompletedcommand.cpp \ - $$PWD/codecompletion.cpp \ - $$PWD/codemodelbackendipc_global.cpp \ - $$PWD/cmbregisterprojectsforcodecompletioncommand.cpp \ - $$PWD/cmbunregisterprojectsforcodecompletioncommand.cpp \ - $$PWD/translationunitdoesnotexistcommand.cpp \ - $$PWD/codecompletionchunk.cpp \ - $$PWD/projectpartcontainer.cpp \ - $$PWD/projectpartsdonotexistcommand.cpp - - -HEADERS += $$PWD/codemodelbackendipc_global.h \ - $$PWD/ipcserverinterface.h \ - $$PWD/ipcserverproxy.h \ - $$PWD/ipcserver.h \ - $$PWD/ipcclientinterface.h \ - $$PWD/cmbendcommand.h \ - $$PWD/cmbalivecommand.h \ - $$PWD/ipcclientproxy.h \ - $$PWD/cmbcommands.h \ - $$PWD/writecommandblock.h \ - $$PWD/readcommandblock.h \ - $$PWD/ipcinterface.h \ - $$PWD/connectionserver.h \ - $$PWD/connectionclient.h \ - $$PWD/cmbechocommand.h \ - $$PWD/ipcclientdispatcher.h \ - $$PWD/cmbregistertranslationunitsforcodecompletioncommand.h \ - $$PWD/filecontainer.h \ - $$PWD/cmbunregistertranslationunitsforcodecompletioncommand.h \ - $$PWD/cmbcompletecodecommand.h \ - $$PWD/cmbcodecompletedcommand.h \ - $$PWD/codecompletion.h \ - $$PWD/cmbregisterprojectsforcodecompletioncommand.h \ - $$PWD/cmbunregisterprojectsforcodecompletioncommand.h \ - $$PWD/translationunitdoesnotexistcommand.h \ - $$PWD/codecompletionchunk.h \ - $$PWD/projectpartcontainer.h \ - $$PWD/projectpartsdonotexistcommand.h diff --git a/src/libs/codemodelbackendipc/source/translationunitdoesnotexistcommand.cpp b/src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.cpp index af45837cf2..af45837cf2 100644 --- a/src/libs/codemodelbackendipc/source/translationunitdoesnotexistcommand.cpp +++ b/src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.cpp diff --git a/src/libs/codemodelbackendipc/source/translationunitdoesnotexistcommand.h b/src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.h index 29e4c26f67..29e4c26f67 100644 --- a/src/libs/codemodelbackendipc/source/translationunitdoesnotexistcommand.h +++ b/src/libs/codemodelbackendipc/translationunitdoesnotexistcommand.h diff --git a/src/libs/codemodelbackendipc/source/writecommandblock.cpp b/src/libs/codemodelbackendipc/writecommandblock.cpp index 61cf34b081..61cf34b081 100644 --- a/src/libs/codemodelbackendipc/source/writecommandblock.cpp +++ b/src/libs/codemodelbackendipc/writecommandblock.cpp diff --git a/src/libs/codemodelbackendipc/source/writecommandblock.h b/src/libs/codemodelbackendipc/writecommandblock.h index 3df658041b..3df658041b 100644 --- a/src/libs/codemodelbackendipc/source/writecommandblock.h +++ b/src/libs/codemodelbackendipc/writecommandblock.h diff --git a/src/tools/codemodelbackend/codemodelbackend.pri b/src/tools/codemodelbackend/codemodelbackend.pri index adecfde825..c1e96457b8 100644 --- a/src/tools/codemodelbackend/codemodelbackend.pri +++ b/src/tools/codemodelbackend/codemodelbackend.pri @@ -22,7 +22,7 @@ LIBS += -L$$OUT_PWD/../codemodelbackendipc/lib/qtcreator -lCodemodelbackendipc - LIBS += $$LLVM_LIBS INCLUDEPATH += $$LLVM_INCLUDEPATH -INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc/source +INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/codemodelbackendipc INCLUDEPATH *= $$IDE_SOURCE_TREE/src/libs/sqlite SOURCES += codemodelbackendmain.cpp |