1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove explicit RCC_DIR addition to INCLUDEPATH

Browse Source 
qrc_ files are generally not meant to be included, so there is not much
point in doing this.
qprintsupport was a notable exception - which broke on mac and thus
needed a hack. just remove the qrc_ inclusion.

Change-Id: If5115665f331a280869e800673bf7b81d3ab559a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
This commit is contained in:
Oswald Buddenhagen 2012-04-10 19:30:20 +02:00
parent 10075973e2
commit 0202e15617
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mkspecs/features/qt_module_config.prf
View File

@ -16,7 +16,6 @@ MODULE_PRIVATE_INCLUDES = $$eval(QT.$${MODULE}.private_includes)
INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES
INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES/$$TARGET INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES/$$TARGET
INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat
!isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR
TEMPLATE = lib TEMPLATE = lib
isEmpty(QT_MAJOR_VERSION) { isEmpty(QT_MAJOR_VERSION) {
VERSION=5.0.0 VERSION=5.0.0

3
src/printsupport/dialogs/qprintdialog_unix.cpp
View File

@ -1351,9 +1351,6 @@ QT_END_NAMESPACE
#include "moc_qprintdialog.cpp" #include "moc_qprintdialog.cpp"
#include "qprintdialog_unix.moc" #include "qprintdialog_unix.moc"
#ifndef Q_OS_MAC
#include "qrc_qprintdialog.cpp"
#endif
#endif // QT_NO_PRINTDIALOG #endif // QT_NO_PRINTDIALOG