diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-27 11:31:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-27 11:31:32 +0200 |
| commit | 150b8ca29417de2cd423ff92478eaf4cb2906601 (patch) | |
| tree | aa1c43ee9d096a4464636bcb5f294a11846572f4 /src/tools | |
| parent | bd78389fc4fe0a4367696ba2fdcc6e8d09863698 (diff) | |
| parent | 16a36239ab9e9be45a940aeff94f35e29bdeb944 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/rcc/main.cpp | 1 | ||||
| -rw-r--r-- | src/tools/rcc/rcc.pro | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index 510a552c12..972c59ef2e 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include <rcc.h> -#include "../../corelib/kernel/qcorecmdlineargs_p.h" #include <qdebug.h> #include <qdir.h> diff --git a/src/tools/rcc/rcc.pro b/src/tools/rcc/rcc.pro index 354747db01..de3cc90e1b 100644 --- a/src/tools/rcc/rcc.pro +++ b/src/tools/rcc/rcc.pro @@ -4,7 +4,6 @@ CONFIG += force_bootstrap DEFINES += QT_RCC QT_NO_CAST_FROM_ASCII include(rcc.pri) -HEADERS += ../../corelib/kernel/qcorecmdlineargs_p.h SOURCES += main.cpp load(qt_tool) |