diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-02-27 10:35:54 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-27 02:51:54 +0100 |
| commit | dbf1c74bf24eb399e1281be795cf56659adc3308 (patch) | |
| tree | 289035112cd85310e2f55615cd0f3078832f7e95 /src/declarative/declarative.pro | |
| parent | c9cf51b931961fdb0410a21e03b4cd8667560584 (diff) | |
Define Q_QUICK1_EXPORT independently
Define Q_QUICK1_EXPORT and Q_QUICK1_PRIVATE_EXPORT inside the
qtquick1 module rather than using the definition in qtbase.
This change undefines the definitions from qglobal.h; the undef
should be removed once the definitions have been expunged from
qtbase itself.
Change-Id: I1ee6fa1e513d110d9a298d897a8d3d465290e9ce
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/declarative/declarative.pro')
| -rw-r--r-- | src/declarative/declarative.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro index fc430483..754e6e9c 100644 --- a/src/declarative/declarative.pro +++ b/src/declarative/declarative.pro @@ -12,7 +12,7 @@ MODULE_PRI = ../../modules/qt_quick1.pri MODULE=quick1 load(qt_module_config) -DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING +DEFINES += QT_BUILD_QUICK1_LIB QT_NO_URL_CAST_FROM_STRING win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 @@ -30,6 +30,10 @@ include(util/util.pri) include(graphicsitems/graphicsitems.pri) include(debugger/debugger.pri) +HEADERS += \ + qtquick1global.h \ + qtquick1global_p.h + linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND DEFINES += QT_NO_OPENTYPE |