diff options
-rw-r--r-- | src/libs/3rdparty/cplusplus/AST.cpp (renamed from src/shared/cplusplus/AST.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/AST.h (renamed from src/shared/cplusplus/AST.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTClone.cpp (renamed from src/shared/cplusplus/ASTClone.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTMatch0.cpp (renamed from src/shared/cplusplus/ASTMatch0.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTMatcher.cpp (renamed from src/shared/cplusplus/ASTMatcher.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTMatcher.h (renamed from src/shared/cplusplus/ASTMatcher.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTPatternBuilder.cpp (renamed from src/shared/cplusplus/ASTPatternBuilder.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTPatternBuilder.h (renamed from src/shared/cplusplus/ASTPatternBuilder.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTVisit.cpp (renamed from src/shared/cplusplus/ASTVisit.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTVisitor.cpp (renamed from src/shared/cplusplus/ASTVisitor.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTVisitor.h (renamed from src/shared/cplusplus/ASTVisitor.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ASTfwd.h (renamed from src/shared/cplusplus/ASTfwd.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Bind.cpp (renamed from src/shared/cplusplus/Bind.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Bind.h (renamed from src/shared/cplusplus/Bind.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/CPlusPlus.h (renamed from src/shared/cplusplus/CPlusPlus.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h (renamed from src/shared/cplusplus/CPlusPlusForwardDeclarations.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Control.cpp (renamed from src/shared/cplusplus/Control.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Control.h (renamed from src/shared/cplusplus/Control.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/CoreTypes.cpp (renamed from src/shared/cplusplus/CoreTypes.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/CoreTypes.h (renamed from src/shared/cplusplus/CoreTypes.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/DiagnosticClient.cpp (renamed from src/shared/cplusplus/DiagnosticClient.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/DiagnosticClient.h (renamed from src/shared/cplusplus/DiagnosticClient.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/FullySpecifiedType.cpp (renamed from src/shared/cplusplus/FullySpecifiedType.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/FullySpecifiedType.h (renamed from src/shared/cplusplus/FullySpecifiedType.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Keywords.cpp (renamed from src/shared/cplusplus/Keywords.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Keywords.kwgen (renamed from src/shared/cplusplus/Keywords.kwgen) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Lexer.cpp (renamed from src/shared/cplusplus/Lexer.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Lexer.h (renamed from src/shared/cplusplus/Lexer.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/LiteralTable.cpp (renamed from src/shared/cplusplus/LiteralTable.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/LiteralTable.h (renamed from src/shared/cplusplus/LiteralTable.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Literals.cpp (renamed from src/shared/cplusplus/Literals.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Literals.h (renamed from src/shared/cplusplus/Literals.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/MemoryPool.cpp (renamed from src/shared/cplusplus/MemoryPool.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/MemoryPool.h (renamed from src/shared/cplusplus/MemoryPool.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Name.cpp (renamed from src/shared/cplusplus/Name.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Name.h (renamed from src/shared/cplusplus/Name.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/NameVisitor.cpp (renamed from src/shared/cplusplus/NameVisitor.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/NameVisitor.h (renamed from src/shared/cplusplus/NameVisitor.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Names.cpp (renamed from src/shared/cplusplus/Names.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Names.h (renamed from src/shared/cplusplus/Names.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ObjectiveCAtKeywords.cpp (renamed from src/shared/cplusplus/ObjectiveCAtKeywords.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp (renamed from src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.h (renamed from src/shared/cplusplus/ObjectiveCTypeQualifiers.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Parser.cpp (renamed from src/shared/cplusplus/Parser.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Parser.h (renamed from src/shared/cplusplus/Parser.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/QtContextKeywords.cpp (renamed from src/shared/cplusplus/QtContextKeywords.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/QtContextKeywords.h (renamed from src/shared/cplusplus/QtContextKeywords.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Scope.cpp (renamed from src/shared/cplusplus/Scope.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Scope.h (renamed from src/shared/cplusplus/Scope.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Symbol.cpp (renamed from src/shared/cplusplus/Symbol.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Symbol.h (renamed from src/shared/cplusplus/Symbol.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/SymbolVisitor.cpp (renamed from src/shared/cplusplus/SymbolVisitor.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/SymbolVisitor.h (renamed from src/shared/cplusplus/SymbolVisitor.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Symbols.cpp (renamed from src/shared/cplusplus/Symbols.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Symbols.h (renamed from src/shared/cplusplus/Symbols.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Token.cpp (renamed from src/shared/cplusplus/Token.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Token.h (renamed from src/shared/cplusplus/Token.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/TranslationUnit.cpp (renamed from src/shared/cplusplus/TranslationUnit.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/TranslationUnit.h (renamed from src/shared/cplusplus/TranslationUnit.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Type.cpp (renamed from src/shared/cplusplus/Type.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/Type.h (renamed from src/shared/cplusplus/Type.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/TypeMatcher.cpp (renamed from src/shared/cplusplus/TypeMatcher.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/TypeMatcher.h (renamed from src/shared/cplusplus/TypeMatcher.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/TypeVisitor.cpp (renamed from src/shared/cplusplus/TypeVisitor.cpp) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/TypeVisitor.h (renamed from src/shared/cplusplus/TypeVisitor.h) | 0 | ||||
-rw-r--r-- | src/libs/3rdparty/cplusplus/cplusplus.pri (renamed from src/shared/cplusplus/cplusplus.pri) | 0 | ||||
-rw-r--r-- | src/libs/cplusplus/cplusplus-lib.pri | 2 | ||||
-rw-r--r-- | src/libs/cplusplus/cplusplus.pri | 4 | ||||
-rw-r--r-- | tests/auto/cplusplus/shared/shared.pri | 2 | ||||
-rw-r--r-- | tests/manual/plain-cplusplus/plain-cplusplus.pro | 2 |
70 files changed, 5 insertions, 5 deletions
diff --git a/src/shared/cplusplus/AST.cpp b/src/libs/3rdparty/cplusplus/AST.cpp index bf8f7789c0..bf8f7789c0 100644 --- a/src/shared/cplusplus/AST.cpp +++ b/src/libs/3rdparty/cplusplus/AST.cpp diff --git a/src/shared/cplusplus/AST.h b/src/libs/3rdparty/cplusplus/AST.h index f0555ae250..f0555ae250 100644 --- a/src/shared/cplusplus/AST.h +++ b/src/libs/3rdparty/cplusplus/AST.h diff --git a/src/shared/cplusplus/ASTClone.cpp b/src/libs/3rdparty/cplusplus/ASTClone.cpp index a63147d809..a63147d809 100644 --- a/src/shared/cplusplus/ASTClone.cpp +++ b/src/libs/3rdparty/cplusplus/ASTClone.cpp diff --git a/src/shared/cplusplus/ASTMatch0.cpp b/src/libs/3rdparty/cplusplus/ASTMatch0.cpp index e4215b0e96..e4215b0e96 100644 --- a/src/shared/cplusplus/ASTMatch0.cpp +++ b/src/libs/3rdparty/cplusplus/ASTMatch0.cpp diff --git a/src/shared/cplusplus/ASTMatcher.cpp b/src/libs/3rdparty/cplusplus/ASTMatcher.cpp index b0ef37868e..b0ef37868e 100644 --- a/src/shared/cplusplus/ASTMatcher.cpp +++ b/src/libs/3rdparty/cplusplus/ASTMatcher.cpp diff --git a/src/shared/cplusplus/ASTMatcher.h b/src/libs/3rdparty/cplusplus/ASTMatcher.h index 4245dd1e22..4245dd1e22 100644 --- a/src/shared/cplusplus/ASTMatcher.h +++ b/src/libs/3rdparty/cplusplus/ASTMatcher.h diff --git a/src/shared/cplusplus/ASTPatternBuilder.cpp b/src/libs/3rdparty/cplusplus/ASTPatternBuilder.cpp index 3749618f48..3749618f48 100644 --- a/src/shared/cplusplus/ASTPatternBuilder.cpp +++ b/src/libs/3rdparty/cplusplus/ASTPatternBuilder.cpp diff --git a/src/shared/cplusplus/ASTPatternBuilder.h b/src/libs/3rdparty/cplusplus/ASTPatternBuilder.h index e36fee6014..e36fee6014 100644 --- a/src/shared/cplusplus/ASTPatternBuilder.h +++ b/src/libs/3rdparty/cplusplus/ASTPatternBuilder.h diff --git a/src/shared/cplusplus/ASTVisit.cpp b/src/libs/3rdparty/cplusplus/ASTVisit.cpp index 1742789bb1..1742789bb1 100644 --- a/src/shared/cplusplus/ASTVisit.cpp +++ b/src/libs/3rdparty/cplusplus/ASTVisit.cpp diff --git a/src/shared/cplusplus/ASTVisitor.cpp b/src/libs/3rdparty/cplusplus/ASTVisitor.cpp index 811f0e0008..811f0e0008 100644 --- a/src/shared/cplusplus/ASTVisitor.cpp +++ b/src/libs/3rdparty/cplusplus/ASTVisitor.cpp diff --git a/src/shared/cplusplus/ASTVisitor.h b/src/libs/3rdparty/cplusplus/ASTVisitor.h index 0ca4c26cd5..0ca4c26cd5 100644 --- a/src/shared/cplusplus/ASTVisitor.h +++ b/src/libs/3rdparty/cplusplus/ASTVisitor.h diff --git a/src/shared/cplusplus/ASTfwd.h b/src/libs/3rdparty/cplusplus/ASTfwd.h index 09735c4097..09735c4097 100644 --- a/src/shared/cplusplus/ASTfwd.h +++ b/src/libs/3rdparty/cplusplus/ASTfwd.h diff --git a/src/shared/cplusplus/Bind.cpp b/src/libs/3rdparty/cplusplus/Bind.cpp index 0b6bda0d6e..0b6bda0d6e 100644 --- a/src/shared/cplusplus/Bind.cpp +++ b/src/libs/3rdparty/cplusplus/Bind.cpp diff --git a/src/shared/cplusplus/Bind.h b/src/libs/3rdparty/cplusplus/Bind.h index bf12c09099..bf12c09099 100644 --- a/src/shared/cplusplus/Bind.h +++ b/src/libs/3rdparty/cplusplus/Bind.h diff --git a/src/shared/cplusplus/CPlusPlus.h b/src/libs/3rdparty/cplusplus/CPlusPlus.h index d557a701f6..d557a701f6 100644 --- a/src/shared/cplusplus/CPlusPlus.h +++ b/src/libs/3rdparty/cplusplus/CPlusPlus.h diff --git a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h b/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h index cb488676b0..cb488676b0 100644 --- a/src/shared/cplusplus/CPlusPlusForwardDeclarations.h +++ b/src/libs/3rdparty/cplusplus/CPlusPlusForwardDeclarations.h diff --git a/src/shared/cplusplus/Control.cpp b/src/libs/3rdparty/cplusplus/Control.cpp index 3492077a94..3492077a94 100644 --- a/src/shared/cplusplus/Control.cpp +++ b/src/libs/3rdparty/cplusplus/Control.cpp diff --git a/src/shared/cplusplus/Control.h b/src/libs/3rdparty/cplusplus/Control.h index 2ca59f885a..2ca59f885a 100644 --- a/src/shared/cplusplus/Control.h +++ b/src/libs/3rdparty/cplusplus/Control.h diff --git a/src/shared/cplusplus/CoreTypes.cpp b/src/libs/3rdparty/cplusplus/CoreTypes.cpp index 9f372bd7d0..9f372bd7d0 100644 --- a/src/shared/cplusplus/CoreTypes.cpp +++ b/src/libs/3rdparty/cplusplus/CoreTypes.cpp diff --git a/src/shared/cplusplus/CoreTypes.h b/src/libs/3rdparty/cplusplus/CoreTypes.h index cb6f8436f0..cb6f8436f0 100644 --- a/src/shared/cplusplus/CoreTypes.h +++ b/src/libs/3rdparty/cplusplus/CoreTypes.h diff --git a/src/shared/cplusplus/DiagnosticClient.cpp b/src/libs/3rdparty/cplusplus/DiagnosticClient.cpp index be8b0d3fc6..be8b0d3fc6 100644 --- a/src/shared/cplusplus/DiagnosticClient.cpp +++ b/src/libs/3rdparty/cplusplus/DiagnosticClient.cpp diff --git a/src/shared/cplusplus/DiagnosticClient.h b/src/libs/3rdparty/cplusplus/DiagnosticClient.h index 58d09cca64..58d09cca64 100644 --- a/src/shared/cplusplus/DiagnosticClient.h +++ b/src/libs/3rdparty/cplusplus/DiagnosticClient.h diff --git a/src/shared/cplusplus/FullySpecifiedType.cpp b/src/libs/3rdparty/cplusplus/FullySpecifiedType.cpp index 4d5279d7de..4d5279d7de 100644 --- a/src/shared/cplusplus/FullySpecifiedType.cpp +++ b/src/libs/3rdparty/cplusplus/FullySpecifiedType.cpp diff --git a/src/shared/cplusplus/FullySpecifiedType.h b/src/libs/3rdparty/cplusplus/FullySpecifiedType.h index c37c03fd7d..c37c03fd7d 100644 --- a/src/shared/cplusplus/FullySpecifiedType.h +++ b/src/libs/3rdparty/cplusplus/FullySpecifiedType.h diff --git a/src/shared/cplusplus/Keywords.cpp b/src/libs/3rdparty/cplusplus/Keywords.cpp index 31c1a56e10..31c1a56e10 100644 --- a/src/shared/cplusplus/Keywords.cpp +++ b/src/libs/3rdparty/cplusplus/Keywords.cpp diff --git a/src/shared/cplusplus/Keywords.kwgen b/src/libs/3rdparty/cplusplus/Keywords.kwgen index f23b3b7cea..f23b3b7cea 100644 --- a/src/shared/cplusplus/Keywords.kwgen +++ b/src/libs/3rdparty/cplusplus/Keywords.kwgen diff --git a/src/shared/cplusplus/Lexer.cpp b/src/libs/3rdparty/cplusplus/Lexer.cpp index 4808e27533..4808e27533 100644 --- a/src/shared/cplusplus/Lexer.cpp +++ b/src/libs/3rdparty/cplusplus/Lexer.cpp diff --git a/src/shared/cplusplus/Lexer.h b/src/libs/3rdparty/cplusplus/Lexer.h index 6b734de94c..6b734de94c 100644 --- a/src/shared/cplusplus/Lexer.h +++ b/src/libs/3rdparty/cplusplus/Lexer.h diff --git a/src/shared/cplusplus/LiteralTable.cpp b/src/libs/3rdparty/cplusplus/LiteralTable.cpp index 928b4fa814..928b4fa814 100644 --- a/src/shared/cplusplus/LiteralTable.cpp +++ b/src/libs/3rdparty/cplusplus/LiteralTable.cpp diff --git a/src/shared/cplusplus/LiteralTable.h b/src/libs/3rdparty/cplusplus/LiteralTable.h index f538a5da9e..f538a5da9e 100644 --- a/src/shared/cplusplus/LiteralTable.h +++ b/src/libs/3rdparty/cplusplus/LiteralTable.h diff --git a/src/shared/cplusplus/Literals.cpp b/src/libs/3rdparty/cplusplus/Literals.cpp index b0b0858dc1..b0b0858dc1 100644 --- a/src/shared/cplusplus/Literals.cpp +++ b/src/libs/3rdparty/cplusplus/Literals.cpp diff --git a/src/shared/cplusplus/Literals.h b/src/libs/3rdparty/cplusplus/Literals.h index d93dc95bfc..d93dc95bfc 100644 --- a/src/shared/cplusplus/Literals.h +++ b/src/libs/3rdparty/cplusplus/Literals.h diff --git a/src/shared/cplusplus/MemoryPool.cpp b/src/libs/3rdparty/cplusplus/MemoryPool.cpp index cb15d4df59..cb15d4df59 100644 --- a/src/shared/cplusplus/MemoryPool.cpp +++ b/src/libs/3rdparty/cplusplus/MemoryPool.cpp diff --git a/src/shared/cplusplus/MemoryPool.h b/src/libs/3rdparty/cplusplus/MemoryPool.h index aa8cb6da3f..aa8cb6da3f 100644 --- a/src/shared/cplusplus/MemoryPool.h +++ b/src/libs/3rdparty/cplusplus/MemoryPool.h diff --git a/src/shared/cplusplus/Name.cpp b/src/libs/3rdparty/cplusplus/Name.cpp index a67bc1b756..a67bc1b756 100644 --- a/src/shared/cplusplus/Name.cpp +++ b/src/libs/3rdparty/cplusplus/Name.cpp diff --git a/src/shared/cplusplus/Name.h b/src/libs/3rdparty/cplusplus/Name.h index 63d9eaca0d..63d9eaca0d 100644 --- a/src/shared/cplusplus/Name.h +++ b/src/libs/3rdparty/cplusplus/Name.h diff --git a/src/shared/cplusplus/NameVisitor.cpp b/src/libs/3rdparty/cplusplus/NameVisitor.cpp index 55832d2213..55832d2213 100644 --- a/src/shared/cplusplus/NameVisitor.cpp +++ b/src/libs/3rdparty/cplusplus/NameVisitor.cpp diff --git a/src/shared/cplusplus/NameVisitor.h b/src/libs/3rdparty/cplusplus/NameVisitor.h index c67dd0c65e..c67dd0c65e 100644 --- a/src/shared/cplusplus/NameVisitor.h +++ b/src/libs/3rdparty/cplusplus/NameVisitor.h diff --git a/src/shared/cplusplus/Names.cpp b/src/libs/3rdparty/cplusplus/Names.cpp index 32458b16e0..32458b16e0 100644 --- a/src/shared/cplusplus/Names.cpp +++ b/src/libs/3rdparty/cplusplus/Names.cpp diff --git a/src/shared/cplusplus/Names.h b/src/libs/3rdparty/cplusplus/Names.h index 385bf12f8e..385bf12f8e 100644 --- a/src/shared/cplusplus/Names.h +++ b/src/libs/3rdparty/cplusplus/Names.h diff --git a/src/shared/cplusplus/ObjectiveCAtKeywords.cpp b/src/libs/3rdparty/cplusplus/ObjectiveCAtKeywords.cpp index 0ca7570494..0ca7570494 100644 --- a/src/shared/cplusplus/ObjectiveCAtKeywords.cpp +++ b/src/libs/3rdparty/cplusplus/ObjectiveCAtKeywords.cpp diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp index 1d470d6ed0..1d470d6ed0 100644 --- a/src/shared/cplusplus/ObjectiveCTypeQualifiers.cpp +++ b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.cpp diff --git a/src/shared/cplusplus/ObjectiveCTypeQualifiers.h b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.h index fa08277c76..fa08277c76 100644 --- a/src/shared/cplusplus/ObjectiveCTypeQualifiers.h +++ b/src/libs/3rdparty/cplusplus/ObjectiveCTypeQualifiers.h diff --git a/src/shared/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp index 0e9f265010..0e9f265010 100644 --- a/src/shared/cplusplus/Parser.cpp +++ b/src/libs/3rdparty/cplusplus/Parser.cpp diff --git a/src/shared/cplusplus/Parser.h b/src/libs/3rdparty/cplusplus/Parser.h index 2b4cb5a419..2b4cb5a419 100644 --- a/src/shared/cplusplus/Parser.h +++ b/src/libs/3rdparty/cplusplus/Parser.h diff --git a/src/shared/cplusplus/QtContextKeywords.cpp b/src/libs/3rdparty/cplusplus/QtContextKeywords.cpp index 8081c8a392..8081c8a392 100644 --- a/src/shared/cplusplus/QtContextKeywords.cpp +++ b/src/libs/3rdparty/cplusplus/QtContextKeywords.cpp diff --git a/src/shared/cplusplus/QtContextKeywords.h b/src/libs/3rdparty/cplusplus/QtContextKeywords.h index ebfef258b9..ebfef258b9 100644 --- a/src/shared/cplusplus/QtContextKeywords.h +++ b/src/libs/3rdparty/cplusplus/QtContextKeywords.h diff --git a/src/shared/cplusplus/Scope.cpp b/src/libs/3rdparty/cplusplus/Scope.cpp index ef0c61fbda..ef0c61fbda 100644 --- a/src/shared/cplusplus/Scope.cpp +++ b/src/libs/3rdparty/cplusplus/Scope.cpp diff --git a/src/shared/cplusplus/Scope.h b/src/libs/3rdparty/cplusplus/Scope.h index 5f43bce4f8..5f43bce4f8 100644 --- a/src/shared/cplusplus/Scope.h +++ b/src/libs/3rdparty/cplusplus/Scope.h diff --git a/src/shared/cplusplus/Symbol.cpp b/src/libs/3rdparty/cplusplus/Symbol.cpp index 864415064c..864415064c 100644 --- a/src/shared/cplusplus/Symbol.cpp +++ b/src/libs/3rdparty/cplusplus/Symbol.cpp diff --git a/src/shared/cplusplus/Symbol.h b/src/libs/3rdparty/cplusplus/Symbol.h index 36ae0973b6..36ae0973b6 100644 --- a/src/shared/cplusplus/Symbol.h +++ b/src/libs/3rdparty/cplusplus/Symbol.h diff --git a/src/shared/cplusplus/SymbolVisitor.cpp b/src/libs/3rdparty/cplusplus/SymbolVisitor.cpp index 73a4b32cbc..73a4b32cbc 100644 --- a/src/shared/cplusplus/SymbolVisitor.cpp +++ b/src/libs/3rdparty/cplusplus/SymbolVisitor.cpp diff --git a/src/shared/cplusplus/SymbolVisitor.h b/src/libs/3rdparty/cplusplus/SymbolVisitor.h index 99ce4f9b85..99ce4f9b85 100644 --- a/src/shared/cplusplus/SymbolVisitor.h +++ b/src/libs/3rdparty/cplusplus/SymbolVisitor.h diff --git a/src/shared/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp index e6f20bbeaf..e6f20bbeaf 100644 --- a/src/shared/cplusplus/Symbols.cpp +++ b/src/libs/3rdparty/cplusplus/Symbols.cpp diff --git a/src/shared/cplusplus/Symbols.h b/src/libs/3rdparty/cplusplus/Symbols.h index 452d2622ce..452d2622ce 100644 --- a/src/shared/cplusplus/Symbols.h +++ b/src/libs/3rdparty/cplusplus/Symbols.h diff --git a/src/shared/cplusplus/Token.cpp b/src/libs/3rdparty/cplusplus/Token.cpp index d3eeee53ff..d3eeee53ff 100644 --- a/src/shared/cplusplus/Token.cpp +++ b/src/libs/3rdparty/cplusplus/Token.cpp diff --git a/src/shared/cplusplus/Token.h b/src/libs/3rdparty/cplusplus/Token.h index 0c59ae5fc2..0c59ae5fc2 100644 --- a/src/shared/cplusplus/Token.h +++ b/src/libs/3rdparty/cplusplus/Token.h diff --git a/src/shared/cplusplus/TranslationUnit.cpp b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp index ba6572e7a2..ba6572e7a2 100644 --- a/src/shared/cplusplus/TranslationUnit.cpp +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.cpp diff --git a/src/shared/cplusplus/TranslationUnit.h b/src/libs/3rdparty/cplusplus/TranslationUnit.h index 26e7e2f1d3..26e7e2f1d3 100644 --- a/src/shared/cplusplus/TranslationUnit.h +++ b/src/libs/3rdparty/cplusplus/TranslationUnit.h diff --git a/src/shared/cplusplus/Type.cpp b/src/libs/3rdparty/cplusplus/Type.cpp index 79db952e40..79db952e40 100644 --- a/src/shared/cplusplus/Type.cpp +++ b/src/libs/3rdparty/cplusplus/Type.cpp diff --git a/src/shared/cplusplus/Type.h b/src/libs/3rdparty/cplusplus/Type.h index c51bbede39..c51bbede39 100644 --- a/src/shared/cplusplus/Type.h +++ b/src/libs/3rdparty/cplusplus/Type.h diff --git a/src/shared/cplusplus/TypeMatcher.cpp b/src/libs/3rdparty/cplusplus/TypeMatcher.cpp index 5425e066e9..5425e066e9 100644 --- a/src/shared/cplusplus/TypeMatcher.cpp +++ b/src/libs/3rdparty/cplusplus/TypeMatcher.cpp diff --git a/src/shared/cplusplus/TypeMatcher.h b/src/libs/3rdparty/cplusplus/TypeMatcher.h index b1804d414a..b1804d414a 100644 --- a/src/shared/cplusplus/TypeMatcher.h +++ b/src/libs/3rdparty/cplusplus/TypeMatcher.h diff --git a/src/shared/cplusplus/TypeVisitor.cpp b/src/libs/3rdparty/cplusplus/TypeVisitor.cpp index bc820392ee..bc820392ee 100644 --- a/src/shared/cplusplus/TypeVisitor.cpp +++ b/src/libs/3rdparty/cplusplus/TypeVisitor.cpp diff --git a/src/shared/cplusplus/TypeVisitor.h b/src/libs/3rdparty/cplusplus/TypeVisitor.h index 6036fe5203..6036fe5203 100644 --- a/src/shared/cplusplus/TypeVisitor.h +++ b/src/libs/3rdparty/cplusplus/TypeVisitor.h diff --git a/src/shared/cplusplus/cplusplus.pri b/src/libs/3rdparty/cplusplus/cplusplus.pri index fffdbc6070..fffdbc6070 100644 --- a/src/shared/cplusplus/cplusplus.pri +++ b/src/libs/3rdparty/cplusplus/cplusplus.pri diff --git a/src/libs/cplusplus/cplusplus-lib.pri b/src/libs/cplusplus/cplusplus-lib.pri index f08d5d1925..f2683c7dac 100644 --- a/src/libs/cplusplus/cplusplus-lib.pri +++ b/src/libs/cplusplus/cplusplus-lib.pri @@ -6,7 +6,7 @@ contains(CONFIG, dll) { INCLUDEPATH += $$PWD -include(../../shared/cplusplus/cplusplus.pri) +include(../3rdparty/cplusplus/cplusplus.pri) contains(QT, gui) { HEADERS += \ diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri index 8b49cd3d0e..7fdbdb05a8 100644 --- a/src/libs/cplusplus/cplusplus.pri +++ b/src/libs/cplusplus/cplusplus.pri @@ -1,3 +1,3 @@ -INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus -INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus +INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus +INCLUDEPATH += $$PWD LIBS *= -l$$qtLibraryName(CPlusPlus) diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri index ae551666c6..311cd56ff5 100644 --- a/tests/auto/cplusplus/shared/shared.pri +++ b/tests/auto/cplusplus/shared/shared.pri @@ -1,6 +1,6 @@ DEFINES+=CPLUSPLUS_BUILD_STATIC_LIB INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/cplusplus -INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus +INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri) include($$IDE_SOURCE_TREE/src/rpath.pri) diff --git a/tests/manual/plain-cplusplus/plain-cplusplus.pro b/tests/manual/plain-cplusplus/plain-cplusplus.pro index b2c5dc6e18..f6b206854d 100644 --- a/tests/manual/plain-cplusplus/plain-cplusplus.pro +++ b/tests/manual/plain-cplusplus/plain-cplusplus.pro @@ -7,7 +7,7 @@ macx { release:LIBS += -Wl,-exported_symbol -Wl,_main } -include(../../../src/shared/cplusplus/cplusplus.pri) +include(../../../src/libs/3rdparty/cplusplus/cplusplus.pri) # Input HEADERS += Preprocessor.h |