diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 16:52:36 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-03 00:39:18 +0100 |
| commit | 01dc7e2ea476e0e6dcdce2e72979bbc858f4057d (patch) | |
| tree | d8796f7695bbf8ad42abf47cd84c1b5e000ef795 /src/qtquick1/qtquick1.pro | |
| parent | 5e07b57b818326da47a46d384415041fa4cea0ba (diff) | |
Remove QtQuick1 elements from qtdeclarative
QtQuick1 is now contained in a separate repository.
Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/qtquick1/qtquick1.pro')
| -rw-r--r-- | src/qtquick1/qtquick1.pro | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/src/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro deleted file mode 100644 index 529e3a0ae3..0000000000 --- a/src/qtquick1/qtquick1.pro +++ /dev/null @@ -1,44 +0,0 @@ -load(qt_module) - -TARGET = QtQuick1 -QPRO_PWD = $$PWD - -CONFIG += module -CONFIG += dll warn_on -MODULE_PRI += ../../modules/qt_qtquick1.pri - -QT += testlib-private declarative testlib declarative-private core-private gui-private network widgets-private v8-private -DEFINES += QT_BUILD_QTQUICK1_LIB QT_NO_URL_CAST_FROM_STRING - -load(qt_module_config) - -# Install qtquick1.prf into the Qt mkspecs so that "CONFIG += qtquick1" -# can be used in customer applications to build against QtQuick 1. -feature.path = $$[QT_INSTALL_DATA]/mkspecs/features -feature.files = $$PWD/features/qtquick1.prf -INSTALLS += feature - -win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS - -#INCLUDEPATH += $$PWD/QtQuick1 -#INCLUDEPATH += $$PWD - -include(util/util.pri) -include(graphicsitems/graphicsitems.pri) - -HEADERS += qtquick1_p.h -SOURCES += qtquick1.cpp - -mac { - # FIXME: this is a workaround for broken qmake logic in qtAddModule() - # This function refuses to use frameworks unless the framework exists on - # the filesystem at the time qmake is run, resulting in a build failure - # if QtQuick1 is qmaked before QtDeclarative is built and frameworks are - # in use. qtAddLibrary() contains correct logic to deal with this, so - # we'll explicitly call that for now. - load(qt) - LIBS -= -lQtDeclarative # in non-framework builds, these should be re-added - LIBS -= -lQtDeclarative_debug # within the qtAddLibrary if appropriate, so no - qtAddLibrary(QtDeclarative) # harm done :) -} - |