qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't include qconfig.cpp into moc and uic 

whatever it was used for is long gone.

Change-Id: Ifab7ae7968b1ab65982b1a6414274b3502bbc3d0
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Oswald Buddenhagen 2013-08-09 15:21:34 +02:00 committed by The Qt Project
parent 12905fa30f
commit ca513feb03
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/moc/main.cpp
View File

@ -42,7 +42,7 @@
#include "preprocessor.h" #include "preprocessor.h"
#include "moc.h" #include "moc.h"
#include "outputrevision.h" #include "outputrevision.h"
#include <qconfig.cpp>
#include <qfile.h> #include <qfile.h>
#include <qfileinfo.h> #include <qfileinfo.h>
#include <qdir.h> #include <qdir.h>

2
src/tools/moc/moc.pro
View File

@ -3,8 +3,6 @@ CONFIG += force_bootstrap
DEFINES += QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS DEFINES += QT_MOC QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_COMPRESS
INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
include(moc.pri) include(moc.pri)
HEADERS += qdatetime_p.h HEADERS += qdatetime_p.h
SOURCES += main.cpp SOURCES += main.cpp

2
src/tools/uic/main.cpp
View File

@ -42,7 +42,7 @@
#include "uic.h" #include "uic.h"
#include "option.h" #include "option.h"
#include "driver.h" #include "driver.h"
#include "../../corelib/global/qconfig.cpp"
#include <qfile.h> #include <qfile.h>
#include <qdir.h> #include <qdir.h>
#include <qtextstream.h> #include <qtextstream.h>