Eliminate second top level .pro file to keep CI system happy

Change-Id: I92274c0564f4b2ffe1a8469adca91167426862ea
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>

12 files changed, 86 insertions, 88 deletions

diff --git a/README b/README
index b04dfde86..0ca5ef110 100644
--- a/README
+++ b/README
@@ -77,7 +77,7 @@ case - which is what Qt3D is for - it has to install directly into the target Qt
 In this mode 1) after the main library is compiled subsequent targets can simply
 resolve includes and link time dependencies by use of qt3d.prf and qtquick3d.prf.
 These two files are installed into the target Qt's makespecs/features directory
-during the processing of the quick3d.pro file.
+during the processing of the qt3d.pro file.
 
 In 2) the libraries, plugins and so on are sitting inside the build tree after
 the compile step.  As a result in order to resolve includes and dependencies
diff --git a/debian/rules b/debian/rules
index a09b5b39a..bfd3e9b88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,4 +44,4 @@ DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
 common-configure-arch::
-	qmake -spec linux-g++-maemo quick3d.pro CONFIG+=maemo CONFIG+=package
+	qmake -spec linux-g++-maemo qt3d.pro CONFIG+=maemo CONFIG+=package
diff --git a/devices/maemo5/debian/rules b/devices/maemo5/debian/rules
index 5aabd23c7..7b8bb7220 100755
--- a/devices/maemo5/debian/rules
+++ b/devices/maemo5/debian/rules
@@ -36,7 +36,7 @@ DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
 common-configure-arch::
-	qmake -spec linux-g++-maemo5 quick3d.pro CONFIG+=maemo CONFIG+=package
+	qmake -spec linux-g++-maemo5 qt3d.pro CONFIG+=maemo CONFIG+=package
 
 common-install-arch:: install-desktop-items
 
diff --git a/devices/ubuntu/debian/rules b/devices/ubuntu/debian/rules
index a0f6b925a..bd2182457 100755
--- a/devices/ubuntu/debian/rules
+++ b/devices/ubuntu/debian/rules
@@ -41,7 +41,7 @@ DEB_MAKE_INSTALL_TARGET := INSTALL_ROOT=$(DEB_DESTDIR) install
 DEB_DH_INSTALL_SOURCEDIR := debian/tmp
 
 common-configure-arch::
-	qmake $(QMAKE_CONF_MKSPEC) quick3d.pro $(QMAKE_CONF_OPTS) CONFIG+=package
+	qmake $(QMAKE_CONF_MKSPEC) qt3d.pro $(QMAKE_CONF_OPTS) CONFIG+=package
 
 common-install-arch:: install-desktops
 
diff --git a/doc/src/qt3d-building.qdoc b/doc/src/qt3d-building.qdoc
index 176c2d32a..811ac30d2 100644
--- a/doc/src/qt3d-building.qdoc
+++ b/doc/src/qt3d-building.qdoc
@@ -97,8 +97,8 @@
 
     \bold{Step 1} - Open the QtQuick3D project.
 
-    Choose \c{Open} from the \c{File} menu and navigate to the quick3d.pro project
-    file \c {$HOME/depot/qt/quick3d/quick3d.pro}.  Click \c{Open}.
+    Choose \c{Open} from the \c{File} menu and navigate to the qt3d.pro project
+    file \c {$HOME/depot/qt/quick3d/qt3d.pro}.  Click \c{Open}.
 
     \image build-qt3d-qtcreator-2.png
 
@@ -217,7 +217,7 @@
     \code
     $ mkdir -p $HOME/build/qt/quick3d
     $ cd $HOME/build/qt/quick3d
-    $ $HOME/build/qt/4.7/bin/qmake $HOME/depot/qt/quick3d/quick3d.pro
+    $ $HOME/build/qt/4.7/bin/qmake $HOME/depot/qt/quick3d/qt3d.pro
     $ make -j 4
     $ bin/moon
     \endcode
@@ -232,7 +232,7 @@
     \code
     mkdir \build\qt\quick3d
     cd \build\qt\quick3d
-    qmake \depot\qt\quick3d\quick3d.pro
+    qmake \depot\qt\quick3d\qt3d.pro
     nmake
     bin\moon
     \endcode
diff --git a/qt3d.pro b/qt3d.pro
index a8006a165..cda69359e 100644
--- a/qt3d.pro
+++ b/qt3d.pro
@@ -1,2 +1,70 @@
-include(quick3d.pro)
+TEMPLATE = subdirs
+SUBDIRS += src
+!gcov: SUBDIRS += util examples demos
 
+include(pkg.pri)
+
+!package: SUBDIRS += tutorials
+
+SUBDIRS += tests
+CONFIG += ordered
+
+include(doc/doc.pri)
+
+# We need opengl, minimum es2 or desktop
+!contains(QT_CONFIG, opengl) {
+    error(QtQuick3D requires OpenGL!)
+}
+contains(QT_CONFIG, opengles1) {
+    error(QtQuick3D does not support OpenGL ES 1!)
+}
+# We need qt declarative
+!contains(QT_CONFIG, declarative) {
+    error(QtQuick3D requires Qt Declarative!)
+}
+
+# Install qt3d.prf into the Qt mkspecs so that "CONFIG += qt3d"
+# can be used in applications to build against Qt3D.
+package {
+    distInstalls.files = features/qt3d.prf features/qt3dquick.prf
+    distInstalls.path = $$QT3D_INSTALL_DATA/mkspecs/features
+    !qtc_hmtn: INSTALLS += distInstalls
+} else {
+    symbian|win32 {
+        Qt3DFile=$$PWD\\features\\qt3d.prf
+        Qt3DFile=$$replace(Qt3DFile,/,\\)
+        featuresDir=$$QT3D_INSTALL_DATA\\mkspecs\\features
+        featuresDir=$$replace(featuresDir,/,\\)
+        system(copy "$$Qt3DFile $$featuresDir")
+
+        Qt3DQuickFile=$$PWD\\features\\qt3dquick.prf
+        Qt3DQuickFile=$$replace(Qt3DQuickFile,/,\\)
+        system(copy "$$Qt3DQuickFile $$featuresDir")
+    } else {
+        Qt3DFile=$$PWD/features/qt3d.prf
+        featuresDir=$$QT3D_INSTALL_DATA/mkspecs/features
+        system(cp "$$Qt3DFile $$featuresDir")
+
+        Qt3DQuickFile=$$PWD/features/qt3dquick.prf
+        system(cp "$$Qt3DQuickFile $$featuresDir")
+    }
+}
+
+symbian {
+    # symbian needs to be at the end, because qt3d.pro does an ordered build,
+    # and symbian depends on all the others.
+    SUBDIRS += symbianinstall
+
+    symbianinstall.subdir = devices/symbian
+    symbianinstall.target = sub-symbianinstall
+    symbianinstall.depends = $$SUBDIRS
+    symbianinstall.depends -= symbianinstall
+}
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
diff --git a/qtc_packaging/debian_harmattan/README b/qtc_packaging/debian_harmattan/README
index b21b46dff..c41653d01 100644
--- a/qtc_packaging/debian_harmattan/README
+++ b/qtc_packaging/debian_harmattan/README
@@ -77,7 +77,7 @@ case - which is what Qt3D is for - it has to install directly into the target Qt
 In this mode 1) after the main library is compiled subsequent targets can simply
 resolve includes and link time dependencies by use of qt3d.prf and qtquick3d.prf.
 These two files are installed into the target Qt's makespecs/features directory
-during the processing of the quick3d.pro file.
+during the processing of the qt3d.pro file.
 
 In 2) the libraries, plugins and so on are sitting inside the build tree after
 the compile step.  As a result in order to resolve includes and dependencies
diff --git a/qtc_packaging/debian_harmattan/rules b/qtc_packaging/debian_harmattan/rules
index 72f257efc..dc4bbaeb3 100755
--- a/qtc_packaging/debian_harmattan/rules
+++ b/qtc_packaging/debian_harmattan/rules
@@ -54,7 +54,7 @@ DEB_MAKE_INVOKE := $(MAKE) $(PARALLEL_MAKEFLAGS)
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	qmake -spec linux-g++-maemo quick3d.pro CONFIG+=qtc_harmattan # Uncomment this line for use without Qt Creator
+	qmake -spec linux-g++-maemo qt3d.pro CONFIG+=qtc_harmattan # Uncomment this line for use without Qt Creator
 	touch configure-stamp
 
 build: build-stamp
diff --git a/quick3d.pro b/quick3d.pro
deleted file mode 100644
index cda69359e..000000000
--- a/quick3d.pro
+++ /dev/null
@@ -1,70 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS += src
-!gcov: SUBDIRS += util examples demos
-
-include(pkg.pri)
-
-!package: SUBDIRS += tutorials
-
-SUBDIRS += tests
-CONFIG += ordered
-
-include(doc/doc.pri)
-
-# We need opengl, minimum es2 or desktop
-!contains(QT_CONFIG, opengl) {
-    error(QtQuick3D requires OpenGL!)
-}
-contains(QT_CONFIG, opengles1) {
-    error(QtQuick3D does not support OpenGL ES 1!)
-}
-# We need qt declarative
-!contains(QT_CONFIG, declarative) {
-    error(QtQuick3D requires Qt Declarative!)
-}
-
-# Install qt3d.prf into the Qt mkspecs so that "CONFIG += qt3d"
-# can be used in applications to build against Qt3D.
-package {
-    distInstalls.files = features/qt3d.prf features/qt3dquick.prf
-    distInstalls.path = $$QT3D_INSTALL_DATA/mkspecs/features
-    !qtc_hmtn: INSTALLS += distInstalls
-} else {
-    symbian|win32 {
-        Qt3DFile=$$PWD\\features\\qt3d.prf
-        Qt3DFile=$$replace(Qt3DFile,/,\\)
-        featuresDir=$$QT3D_INSTALL_DATA\\mkspecs\\features
-        featuresDir=$$replace(featuresDir,/,\\)
-        system(copy "$$Qt3DFile $$featuresDir")
-
-        Qt3DQuickFile=$$PWD\\features\\qt3dquick.prf
-        Qt3DQuickFile=$$replace(Qt3DQuickFile,/,\\)
-        system(copy "$$Qt3DQuickFile $$featuresDir")
-    } else {
-        Qt3DFile=$$PWD/features/qt3d.prf
-        featuresDir=$$QT3D_INSTALL_DATA/mkspecs/features
-        system(cp "$$Qt3DFile $$featuresDir")
-
-        Qt3DQuickFile=$$PWD/features/qt3dquick.prf
-        system(cp "$$Qt3DQuickFile $$featuresDir")
-    }
-}
-
-symbian {
-    # symbian needs to be at the end, because qt3d.pro does an ordered build,
-    # and symbian depends on all the others.
-    SUBDIRS += symbianinstall
-
-    symbianinstall.subdir = devices/symbian
-    symbianinstall.target = sub-symbianinstall
-    symbianinstall.depends = $$SUBDIRS
-    symbianinstall.depends -= symbianinstall
-}
-
-OTHER_FILES += \
-    qtc_packaging/debian_harmattan/rules \
-    qtc_packaging/debian_harmattan/README \
-    qtc_packaging/debian_harmattan/copyright \
-    qtc_packaging/debian_harmattan/control \
-    qtc_packaging/debian_harmattan/compat \
-    qtc_packaging/debian_harmattan/changelog
diff --git a/src/scripts/build_mac_package.sh b/src/scripts/build_mac_package.sh
index 39fbc3876..cbc0bbd50 100755
--- a/src/scripts/build_mac_package.sh
+++ b/src/scripts/build_mac_package.sh
@@ -44,7 +44,7 @@ set -e
 
 APP=QtQuick3D
 
-PRO=quick3d.pro
+PRO=qt3d.pro
 
 if [[ -z "$1" ]]; then
     echo "Usage: build_bundle.sh 1.2.3"
@@ -52,8 +52,8 @@ if [[ -z "$1" ]]; then
     exit 1;
 fi
 
-if [[ ! -f ./quick3d.pro ]]; then
-    echo "Could not find quick3d.pro in current directory."
+if [[ ! -f ./qt3d.pro ]]; then
+    echo "Could not find qt3d.pro in current directory."
     echo "This script should be run from the root of a Qt3D source tree."
     exit 1;
 fi
@@ -61,7 +61,7 @@ fi
 VER=$1
 
 echo "Building ${APP}..."
-qmake -makefile -spec macx-g++ -r CONFIG+=release CONFIG+=package quick3d.pro
+qmake -makefile -spec macx-g++ -r CONFIG+=release CONFIG+=package qt3d.pro
 make $(JOBS)
 
 DIST=dist
diff --git a/src/scripts/build_src_package.sh b/src/scripts/build_src_package.sh
index 70d51884e..b7eeaba8e 100755
--- a/src/scripts/build_src_package.sh
+++ b/src/scripts/build_src_package.sh
@@ -69,7 +69,7 @@ set -e
 QDOC3=$(qmake -query QT_INSTALL_BINS)/qdoc3
 
 echo "Using Qt ${QDOC3} to build doc"
-test -f quick3d.pro || usage
+test -f qt3d.pro || usage
 
 BRANCH=$1
 VERSION=$2
@@ -79,7 +79,7 @@ echo "Creating zip archive..."
 git archive --format=zip --prefix=qtquick3d-${VERSION}-src/ ${BRANCH} > ../qtquick3d-${VERSION}-src.zip || exit 1
 echo "Creating documentation..."
 rm -r -f doc/html
-qmake quick3d.pro -spec macx-g++ CONFIG+=package >/dev/null || exit 1
+qmake qt3d.pro -spec macx-g++ CONFIG+=package >/dev/null || exit 1
 make docs || exit 1
 cd doc
 cp -r html qtquick3d-${VERSION}
diff --git a/src/scripts/build_win_package.bat b/src/scripts/build_win_package.bat
index f428d2e17..098c17eb7 100644
--- a/src/scripts/build_win_package.bat
+++ b/src/scripts/build_win_package.bat
@@ -79,7 +79,7 @@ set QT_PREFIX_PATH=%QT_PREFIX:~2%
 :: to debug the installer scripts, and do something odd.
 del %QTDIR%\mkspecs\features\qt3d*
 
-qmake.exe quick3d.pro -spec win32-msvc2008 CONFIG+=release CONFIG+=package
+qmake.exe qt3d.pro -spec win32-msvc2008 CONFIG+=release CONFIG+=package
 
 :: This has to be the full path, but without the drive letter...
 set INSTALL_ROOT=%CD:~2%\tmp