diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-04 12:04:43 +0200 |
| commit | 1077edd108129a628195708c787c3922d2270c37 (patch) | |
| tree | 1346bb4e46562b6d6fba22c7e81efa30470044bb /src/corelib/corelib.pro | |
| parent | 0e3823d30c2294eb11c205ca11fca55508478151 (diff) | |
| parent | c41153e69336701488385d9194d72e72164b28b8 (diff) | |
Merge remote branch 'origin/master' into refactor
Diffstat (limited to 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 4efb1b9a22..a31d1e5b7f 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -1,7 +1,11 @@ -MODULE = core TARGET = QtCore QPRO_PWD = $$PWD QT = + +CONFIG += module +MODULE = core # not corelib, as per project file +MODULE_PRI = ../modules/qt_core.pri + DEFINES += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused |