diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2011-12-21 14:45:00 +1000 |
|---|---|---|
| committer | Sarah Jane Smith <sarah.j.smith@nokia.com> | 2011-12-21 08:57:36 +0100 |
| commit | aedf27c0aa3e3d037392335ea96d37e3a9a8b811 (patch) | |
| tree | fec10b3fff19f2cb6e0d3640d73a4ebb7a1fe804 /qt3d.pro | |
| parent | a7db0a7405e3511ef8a78f0ff1cdb3b1ecd92157 (diff) | |
Make Qt3D buildable without widgets or opengl.
Pull out all references to QGLContext, and QGLWidget and so on; and
replace with the equivalent from the gui library. Where there is no
equivalent, eg the BindOptions enum, then reimplement.
Also get rid of the harmattan and symbian packaging goop. This had
become completely unmaintainable, and was making it very hard to see
what dependencies were being pull in by the various parts of the build
system. In order to have any confidence that conditional compilation
would not add in some problematic dependency, clean all this up.
Task-number: QTBUG-23299
Change-Id: Ied92ca1397076986e455674b064d8540bb13c0df
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'qt3d.pro')
| -rw-r--r-- | qt3d.pro | 39 |
1 files changed, 0 insertions, 39 deletions
@@ -2,8 +2,6 @@ TEMPLATE = subdirs SUBDIRS += src !gcov: SUBDIRS += util examples demos -include(pkg.pri) - !package: SUBDIRS += tutorials tests.CONFIG = no_default_install @@ -19,40 +17,3 @@ include(doc/doc.pri) contains(QT_CONFIG, opengles1) { error(Qt3D does not support OpenGL ES 1!) } - -include(pkg.pri) - -# 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 { - 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") - } -} - -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 |