diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-12-02 17:24:19 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-03 03:47:08 +0100 |
commit | 0df026de86a885a7b0acb9138edab14db31d63f7 (patch) | |
tree | a440d39d391be75826554d039e610dd6b8b4b8ed /mkspecs/devices | |
parent | 0d40958347ad0b60fb1ccd15ab7a59e1407e945d (diff) |
Stop using the name "Trolltech" in QSettings
Also change Trolltech for QtProject in other places
Task-number: QTBUG-23269
Change-Id: Ie4e344f23cab77c575562d18b481b3369ce30491
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'mkspecs/devices')
-rw-r--r-- | mkspecs/devices/linux-imx6-g++/qmake.conf | 2 | ||||
-rw-r--r-- | mkspecs/devices/linux-tegra2-g++/qmake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/devices/linux-imx6-g++/qmake.conf b/mkspecs/devices/linux-imx6-g++/qmake.conf index 67e16f2d29..322a19d05b 100644 --- a/mkspecs/devices/linux-imx6-g++/qmake.conf +++ b/mkspecs/devices/linux-imx6-g++/qmake.conf @@ -8,7 +8,7 @@ # /home/tsenyk/qt5/qt5/configure -opensource -confirm-license -make libs -device imx6 \ # -device-option CROSS_COMPILE=/opt/freescale/usr/local/gcc-4.6.2-glibc-2.13-linaro-multilib-2011.12/fsl-linaro-toolchain/bin/arm-fsl-linux-gnueabi- \ # -sysroot <path-to-your-ltib-install>/rootfs -no-gcc-sysroot \ -# -prefix /usr/local/Trolltech/Qt5-imx6-1 +# -prefix /usr/local/Qt-5.0.0/Qt5-imx6-1 # # NOTE: currently ltib doesn't produce a proper staging/sysroot-filessystem. # If gcc's --sysroot is used, the toolchain doesn't find basic binaries (e.g. crt1.o), diff --git a/mkspecs/devices/linux-tegra2-g++/qmake.conf b/mkspecs/devices/linux-tegra2-g++/qmake.conf index c480def19c..c846801a10 100644 --- a/mkspecs/devices/linux-tegra2-g++/qmake.conf +++ b/mkspecs/devices/linux-tegra2-g++/qmake.conf @@ -4,7 +4,7 @@ # This mkspec is based and tested on the TrimSlice using "Ubuntu Natty (11.04) - l4t.r15.01"-release. # It might work with other boards and releases as well. # A typical configure line looks like this: -# <path-to-qt-src>/configure -opensource -confirm-license -make libs -prefix /usr/local/Trolltech/Qt5-tegra2 +# <path-to-qt-src>/configure -opensource -confirm-license -make libs -prefix /usr/local/Qt-5.0.0/Qt5-tegra2 # -device tegra2 -device-option CROSS_COMPILE=<path-to-crosstoolchain>/bin/arm-none-linux-gnueabi- \ # -sysroot <path-to-rootfs> -no-neon |