diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-05-31 16:34:47 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-05-31 17:31:24 +0200 |
commit | 8305848aa599c578a4b076608528d2bf7068ea22 (patch) | |
tree | 3069b78cbedeed7c92c3ebd6b3f723e2be955c23 | |
parent | 187658847cedd62ae0a3f9ef407a8b59020364b4 (diff) |
bump version number to 1.0.0
Change-Id: I0b24563800b3a7c6a1dc450e13aef3ef9e2b2f90
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r-- | qbs.qbs | 2 | ||||
-rw-r--r-- | qbs_version.pri | 2 | ||||
-rw-r--r-- | src/app/qbs/parser/commandlineparser.cpp | 4 | ||||
-rw-r--r-- | src/lib/language/builtindeclarations.cpp | 2 | ||||
-rw-r--r-- | src/lib/language/moduleloader.cpp | 2 | ||||
-rw-r--r-- | src/lib/language/moduleloader.h | 2 |
6 files changed, 7 insertions, 7 deletions
@@ -1,7 +1,7 @@ import qbs 1.0 Project { - property string version: "0.4.0" + property string version: "1.0.0" property bool enableUnitTests: false references: [ "src/app/config/config.qbs", diff --git a/qbs_version.pri b/qbs_version.pri index a50378aab..c6ffa1458 100644 --- a/qbs_version.pri +++ b/qbs_version.pri @@ -1,2 +1,2 @@ -QBS_VERSION = 0.4.0 +QBS_VERSION = 1.0.0 DEFINES += QBS_VERSION=\\\"$$QBS_VERSION\\\" diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index eb0bbe945..dd43002fb 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -428,7 +428,7 @@ void CommandLineParser::CommandLineParserPrivate::setupProjectFile() if (!projectFileInfo.isDir()) throw Error(Tr::tr("Project file '%1' has invalid type.").arg(projectFilePath)); - // TODO: Remove check for '.qbp' in 0.4. + // TODO: Remove check for '.qbp' in 1.1 const QStringList namePatterns = QStringList() << QLatin1String("*.qbp") << QLatin1String("*.qbs"); @@ -453,7 +453,7 @@ void CommandLineParser::CommandLineParserPrivate::setupProjectFile() projectFilePath = QDir::current().filePath(projectFilePath); projectFilePath = QDir::cleanPath(projectFilePath); - // TODO: Remove in 0.4 + // TODO: Remove in 1.1 if (projectFilePath.endsWith(QLatin1String(".qbp"))) qbsInfo() << Tr::tr("Your main project file has the old suffix '.qbp'. This does not " "hurt, but the convention is now to use '.qbs'."); diff --git a/src/lib/language/builtindeclarations.cpp b/src/lib/language/builtindeclarations.cpp index 85b703f07..2e8f75e5f 100644 --- a/src/lib/language/builtindeclarations.cpp +++ b/src/lib/language/builtindeclarations.cpp @@ -116,7 +116,7 @@ BuiltinDeclarations::BuiltinDeclarations() transformer += conditionProperty; m_builtins["Transformer"] = transformer; - QList<PropertyDeclaration> productModule; // ### remove in 0.5 + QList<PropertyDeclaration> productModule; // ### remove in 1.2 m_builtins["ProductModule"] = productModule; QList<PropertyDeclaration> exportItem; m_builtins["Export"] = exportItem; diff --git a/src/lib/language/moduleloader.cpp b/src/lib/language/moduleloader.cpp index 35a2c2835..041226316 100644 --- a/src/lib/language/moduleloader.cpp +++ b/src/lib/language/moduleloader.cpp @@ -182,7 +182,7 @@ void ModuleLoader::handleProduct(ProjectContext *projectContext, Item *item) handleArtifact(&productContext, child); else if (child->typeName() == QLatin1String("Export")) deferExportItem(&productContext, child); - else if (child->typeName() == QLatin1String("ProductModule")) // ### remove in 0.5 + else if (child->typeName() == QLatin1String("ProductModule")) // ### remove in 1.2 handleProductModule(&productContext, child); else if (child->typeName() == QLatin1String("Probe")) resolveProbe(item, child); diff --git a/src/lib/language/moduleloader.h b/src/lib/language/moduleloader.h index d0b2371bb..9a0075ba5 100644 --- a/src/lib/language/moduleloader.h +++ b/src/lib/language/moduleloader.h @@ -149,7 +149,7 @@ private: void handleGroup(ProductContext *productContext, Item *group); void handleArtifact(ProductContext *productContext, Item *item); void deferExportItem(ProductContext *productContext, Item *item); - void handleProductModule(ProductContext *productContext, Item *item); // ### remove in 0.5 + void handleProductModule(ProductContext *productContext, Item *item); // ### remove in 1.2 void mergeExportItems(ProductContext *productContext); void propagateModulesFromProduct(ProductContext *productContext, Item *item); void resolveDependencies(DependsContext *productContext, Item *item); |