feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
96a3d49b07fa0119d11ed4f76d9f1fd5e86686ef
qt-creator/src/libs/cplusplus/cplusplus.qbs

135 lines
4.1 KiB
QML
Raw Normal View History

use new base import style in qbs files Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 11:30:14 +01:00
import qbs 1.0
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
Qbs: Libraries capitalized and relocated in bin on Windows Change-Id: I994027ef50f5f7c4ff1b2bef06d9f8db037243e4 Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-01 19:21:05 +03:00
QtcLibrary {
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
name: "CPlusPlus"
fix include style relating to cplusplus libraries ... and adjust INCLUDEPATH accordingly. while i'm at messing with include statements, also re-order the include blocks according to policy and sort them within bigger blocks. Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-27 18:54:03 +01:00
cpp.includePaths: base.concat("../3rdparty")
Fix qbs build for Qt 5. Make sure newly deprecated stuff is still available. Change-Id: I9ebdfcd9a5ecee125a3c73f5f3254ae319d8b282 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-17 15:32:02 +02:00
cpp.defines: base.concat([
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"NDEBUG",
Generalize QT_NO_CAST_FROM_ASCII Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0 Reviewed-by: hjk <qthjk@ovi.com>
2013-01-12 23:29:24 +02:00
"CPLUSPLUS_BUILD_LIB"
Fix qbs build for Qt 5. Make sure newly deprecated stuff is still available. Change-Id: I9ebdfcd9a5ecee125a3c73f5f3254ae319d8b282 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-09-17 15:32:02 +02:00
])
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
cpp.optimization: "fast"
qbs files: use Qt5 module dependencies Renamed gui -> widgets. Renamed declarative -> quick1. With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported. Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 15:56:23 +02:00
Depends { name: "Qt.widgets" }
CPlusPlus: Fix qbs build. Change-Id: Id38252d7e24bccc2a0c4bf2631d98da632c16533 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-30 16:50:56 +02:00
Depends { name: "Utils" }
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
Group {
Consistently give qbs groups a name. These nicely show up in the project tree in Qt Creator then. Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-06 09:08:16 +02:00
name: "ThirdPartyCPlusPlus"
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
prefix: "../3rdparty/cplusplus/"
files: [
qbs files: Sort files Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-30 13:50:31 +02:00
"AST.cpp",
"AST.h",
"ASTClone.cpp",
"ASTMatch0.cpp",
"ASTMatcher.cpp",
"ASTMatcher.h",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"ASTPatternBuilder.cpp",
qbs files: Sort files Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-30 13:50:31 +02:00
"ASTPatternBuilder.h",
"ASTVisit.cpp",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"ASTVisitor.cpp",
qbs files: Sort files Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-30 13:50:31 +02:00
"ASTVisitor.h",
"ASTfwd.h",
"Bind.cpp",
"Bind.h",
"CPlusPlus.h",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"Control.cpp",
"Control.h",
"CoreTypes.cpp",
"CoreTypes.h",
"DiagnosticClient.cpp",
"DiagnosticClient.h",
"FullySpecifiedType.cpp",
"FullySpecifiedType.h",
qbs files: Sort files Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-30 13:50:31 +02:00
"Keywords.cpp",
"Lexer.cpp",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"Lexer.h",
"LiteralTable.h",
qbs files: Sort files Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-30 13:50:31 +02:00
"Literals.cpp",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"Literals.h",
C++: Do type and name equality checking in a safe manner. Change the TypeMatcher to also match names, and use two "block" lists in SafeMatcher to prevent infinite recursion. Task-number: QTCREATORBUG-11240 Change-Id: I0367ae795ee6be579b83aeb8d46723c877e4aa75 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-03-24 16:06:39 +01:00
"Matcher.cpp",
"Matcher.h",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"MemoryPool.cpp",
"MemoryPool.h",
"Name.cpp",
"Name.h",
"NameVisitor.cpp",
"NameVisitor.h",
"Names.cpp",
"Names.h",
"ObjectiveCAtKeywords.cpp",
"ObjectiveCTypeQualifiers.cpp",
qbs files: Sort files Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-30 13:50:31 +02:00
"ObjectiveCTypeQualifiers.h",
"Parser.cpp",
"Parser.h",
"QtContextKeywords.cpp",
"QtContextKeywords.h",
C++: Do type and name equality checking in a safe manner. Change the TypeMatcher to also match names, and use two "block" lists in SafeMatcher to prevent infinite recursion. Task-number: QTCREATORBUG-11240 Change-Id: I0367ae795ee6be579b83aeb8d46723c877e4aa75 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-03-24 16:06:39 +01:00
"SafeMatcher.cpp",
"SafeMatcher.h",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"Scope.cpp",
"Scope.h",
qbs files: Sort files Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-30 13:50:31 +02:00
"Symbol.cpp",
"Symbol.h",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"SymbolVisitor.h",
qbs files: Sort files Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-30 13:50:31 +02:00
"Symbols.cpp",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"Symbols.h",
qbs files: Sort files Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-09-30 13:50:31 +02:00
"Templates.cpp",
"Templates.h",
"Token.cpp",
"Token.h",
"TranslationUnit.cpp",
"TranslationUnit.h",
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
"Type.cpp",
"Type.h",
"TypeVisitor.cpp",
"TypeVisitor.h",
]
}
Qbs project files: Use groups wherever applicable. Provides better structuring of source files. Change-Id: Ic2d0094312bb7c8da01a1f38270564407fdbefce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-30 18:00:27 +02:00
Group {
name: "General"
files: [
"AlreadyConsideredClassContainer.h",
"ASTParent.cpp", "ASTParent.h",
"ASTPath.cpp", "ASTPath.h",
"BackwardsScanner.cpp", "BackwardsScanner.h",
"CppDocument.cpp", "CppDocument.h",
"CppRewriter.cpp", "CppRewriter.h",
qml: moving most of ModelManager logic to ModelManageInterface Currently ModelManager contains lot logic, but as it sits in QmlJSTools it is not possible to use it in standalone tests. Moving most of the logic to ModelManagerInterface (and cleanup) to allow better testing, and refactoring. This introduces a dependency of the qmljs lib on the cplusplus lib Also a (small) part of the CppTool::ModelManagerInterface has been moved to CPlusPlus::CppModelManagerBase to remove the dependency on CppTools to gather the Qml types exposed from C++. Change-Id: Icad7fe96dfd0f1a2b1058d82bd98c77c40aa5e9d Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-01-23 14:28:31 +01:00
"cppmodelmanagerbase.cpp", "cppmodelmanagerbase.h",
Qbs project files: Use groups wherever applicable. Provides better structuring of source files. Change-Id: Ic2d0094312bb7c8da01a1f38270564407fdbefce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-30 18:00:27 +02:00
"DependencyTable.cpp", "DependencyTable.h",
C++: Revert lookup to 3.4.2 ...which was least buggy. The bugs fixed by the changes we revert here (highlighting/completion for code involving templates) were minor compared to ones we currently have. Those bugs will be addressed by the clang code model anyway. Relevant commits were collected via: $ cd ${QTC}/src/libs/cplusplus $ git log \ --no-merges \ --format=oneline \ v3.4.2..HEAD \ -- LookupContext.* ResolveExpression.* TypeResolver.* TypeOfExpression.* \ ../../plugins/cpptools/cppcompletion_test.cpp From this list the following were skipped due to irrelevance: 88c5b47e535d91f3db99882d5b50b263b46f223c # CppTools: Minor cleanup in completion tests e5255a1f5cac284c4f0d4a85203878c84da86e85 # CppTools: Add a test for ObjC not replacing dot with arrow 5b12c8d63a30e281274cdc267efabead2c736bd8 # CppTools: Support ObjC in member access operator tests 9fef4fb9ca4e65e20ff13b98bcf15e3c6232fdfb # CPlusPlus: Fix warnings about overriding visit(...) methods There were only minor conflicts while reverting those. This changes touches so many files because there were quite some cleanups and renames after the 3.4.2 release. Task-number: QTCREATORBUG-14889 Task-number: QTCREATORBUG-15211 Task-number: QTCREATORBUG-15213 Task-number: QTCREATORBUG-15257 Task-number: QTCREATORBUG-15264 Task-number: QTCREATORBUG-15291 Task-number: QTCREATORBUG-15329 Change-Id: I01f759f8f35ecb4228928a4f22086e279c1a5435 Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-11-19 13:49:26 +01:00
"DeprecatedGenTemplateInstance.cpp", "DeprecatedGenTemplateInstance.h",
Qbs project files: Use groups wherever applicable. Provides better structuring of source files. Change-Id: Ic2d0094312bb7c8da01a1f38270564407fdbefce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-30 18:00:27 +02:00
"ExpressionUnderCursor.cpp", "ExpressionUnderCursor.h",
"FastPreprocessor.cpp", "FastPreprocessor.h",
"FindUsages.cpp", "FindUsages.h",
"Icons.cpp", "Icons.h",
"LookupContext.cpp", "LookupContext.h",
"LookupItem.cpp", "LookupItem.h",
"Macro.cpp", "Macro.h",
"MatchingText.cpp", "MatchingText.h",
"NamePrettyPrinter.cpp", "NamePrettyPrinter.h",
"Overview.cpp", "Overview.h",
"OverviewModel.cpp", "OverviewModel.h",
"PPToken.cpp", "PPToken.h",
"PreprocessorClient.cpp", "PreprocessorClient.h",
"PreprocessorEnvironment.cpp", "PreprocessorEnvironment.h",
"ResolveExpression.cpp", "ResolveExpression.h",
"SimpleLexer.cpp", "SimpleLexer.h",
"SnapshotSymbolVisitor.cpp", "SnapshotSymbolVisitor.h",
"SymbolNameVisitor.cpp", "SymbolNameVisitor.h",
"TypeOfExpression.cpp", "TypeOfExpression.h",
"TypePrettyPrinter.cpp", "TypePrettyPrinter.h",
"cplusplus.qrc",
"findcdbbreakpoint.cpp", "findcdbbreakpoint.h",
"pp-cctype.h",
"pp-engine.cpp", "pp-engine.h",
"pp-scanner.cpp", "pp-scanner.h",
"pp.h",
]
}
rename ProductModule into Export This fixes a bunch of warning when building with the updated qbs version. Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-05-24 15:58:33 +02:00
Export {
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
cpp.includePaths: [
fix include style relating to cplusplus libraries ... and adjust INCLUDEPATH accordingly. while i'm at messing with include statements, also re-order the include blocks according to policy and sort them within bigger blocks. Change-Id: I7762abfd7c4ecf59432b99db2f424e4fa25733a5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-27 18:54:03 +01:00
"../3rdparty"
add qbs files Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
2012-02-09 14:30:09 +01:00
]
}
}
Copy Permalink