diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 10:08:23 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-05-04 10:08:23 +0200 |
| commit | 9c6347f24509bff1dc6b87493adf487c22092990 (patch) | |
| tree | 4306abcc0a1b3c1266ed84fe4ec297f4d7c706ba /src/corelib | |
| parent | 72395bc540c60d9966788817c08cd3e126a40f97 (diff) | |
| parent | 99454287bffcfcf7b0c2c658bea95d8543d2b118 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/corelib.pro | 6 | ||||
| -rw-r--r-- | src/corelib/io/qfilesystemengine_win.cpp | 1 |
2 files changed, 6 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 diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index 82c6ebad05..1dbc40f3ed 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -583,6 +583,7 @@ QString QFileSystemEngine::owner(const QFileSystemEntry &entry, QAbstractFileEng } } #else + Q_UNUSED(entry); Q_UNUSED(own); #endif return name; |