diff options
| -rw-r--r-- | doc/installerfw-getting-started.qdoc | 2 | ||||
| -rw-r--r-- | doc/installerfw.qdoc | 14 | ||||
| -rw-r--r-- | src/libs/installer/component.cpp | 4 | ||||
| -rw-r--r-- | src/libs/installer/packagemanagercore.cpp | 2 | ||||
| -rw-r--r-- | tools/binarycreator/binarycreator.cpp | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/doc/installerfw-getting-started.qdoc b/doc/installerfw-getting-started.qdoc index 063ed64c7..c5f8979f3 100644 --- a/doc/installerfw-getting-started.qdoc +++ b/doc/installerfw-getting-started.qdoc @@ -41,7 +41,7 @@ You can use the Qt Installer Framework to create installers for all platforms supported by - \l{http://doc.qt.nokia.com/5.0-snapshot/supported-platforms.html} + \l{http://qt-project.org/doc/qt-5.0/qtdoc/platform-details.html} {desktop Qt}. The installers have been tested on the following platforms: diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc index 202d642b4..b637ba675 100644 --- a/doc/installerfw.qdoc +++ b/doc/installerfw.qdoc @@ -782,12 +782,12 @@ repogen.exe -p <package_directory> -c <config_directory>\<config_file> repository <repository_directory> - For example, to create a repository that contains only com.nokia.sdk.qt and - com.nokia.sdk.qtcreator, enter the following + For example, to create a repository that contains only org.qt-project.sdk.qt and + org.qt-project.sdk.qtcreator, enter the following command: \code - repogen.exe -p packages -c installer-config\config.xml -i com.nokia.sdk.qt,com.nokia.sdk.qtcreator repository + repogen.exe -p packages -c installer-config\config.xml -i org.qt-project.sdk.qt,org.qt-project.sdk.qtcreator repository \endcode When the repository has been created, upload it to a web server. You must @@ -842,12 +842,12 @@ \endcode For example, enter the following command to create an installer binary - called SDKInstaller.exe that will not contain data for com.nokia.sdk.qt and - com.nokia.qtcreator, because those packages are downloaded from a remote + called SDKInstaller.exe that will not contain data for org.qt-project.sdk.qt and + org.qt-project.qtcreator, because those packages are downloaded from a remote repository: \code - binarycreator.exe -p installer-packages -c installer-config\config.xml -e com.nokia.sdk.qt,com.nokia.qtcreator SDKInstaller.exe + binarycreator.exe -p installer-packages -c installer-config\config.xml -e org.qt-project.sdk.qt,org.qt-project.qtcreator SDKInstaller.exe \endcode \section1 Reducing Installer Size @@ -894,7 +894,7 @@ Some options have default values, and therefore, you can omit them. For example, enter the following command to create an installer binary called SDKInstaller.exe that contains the packages identified by - com.nokia.sdk and their dependencies: + org.qt-project.sdk and their dependencies: \code binarycreator.exe --offline-only -c installer-config -p installer-packes SDKInstaller.exe diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index a9e549cbc..3adccba35 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -389,8 +389,8 @@ PackageManagerCore *Component::packageManagerCore() const } /*! - Returns the parent of this component. If this component is com.nokia.sdk.qt, its - parent is com.nokia.sdk, as far as this exists. + Returns the parent of this component. If this component is org.qt-project.sdk.qt, its + parent is org.qt-project.sdk, as far as this exists. */ Component *Component::parentComponent() const { diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 578acf873..60a89a536 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1259,7 +1259,7 @@ QList<Component*> PackageManagerCore::availableComponents() const \qmlmethod Component QInstaller::componentByName(string name) Returns a component matching \a name. \a name can also contains a version requirement. - E.g. "com.nokia.sdk.qt" returns any component with that name, "com.nokia.sdk.qt->=4.5" requires + E.g. "org.qt-project.sdk.qt" returns any component with that name, "org.qt-project.sdk.qt->=4.5" requires the returned component to have at least version 4.5. If no component matches the requirement, 0 is returned. */ diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 80c083208..f1fd5476c 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -471,7 +471,7 @@ static void printUsage() std::cout << std::endl; std::cout << "Example (online installer):" << std::endl; std::cout << " " << appName << " -c installer-config" << sep << "config.xml -p packages-directory " - "-e com.nokia.sdk.qt,com.nokia.qtcreator -t installerbase" << suffix << " SDKInstaller" + "-e org.qt-project.sdk.qt,org.qt-project.qtcreator -t installerbase" << suffix << " SDKInstaller" << suffix << std::endl; std::cout << std::endl; std::cout << "Creates an installer for the SDK without qt and qt creator." << std::endl; |