feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
This commit is contained in:
Eike Ziller
2012-11-09 11:20:10 +01:00
parent b03ba2bdb1 28bcc5634c
commit fe74a9a722
56 changed files with 646 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/auto/cplusplus/cxx11/cxx11.pro
View File

@@ -1,7 +1,8 @@
include(../../qttest.pri)
include(../shared/shared.pri)
DEFINES+=TESTSRCDIR=\\\"$$PWD\\\"
# Inject the source dir for referencing test data from shadow builds.
DEFINES += SRCDIR=\\\"$$PWD\\\"
SOURCES += tst_cxx11.cpp
OTHER_FILES += \

3
tests/auto/cplusplus/cxx11/tst_cxx11.cpp
View File

@@ -58,7 +58,8 @@ class tst_cxx11: public QObject
*/
static QString testdata(const QString &name = QString())
{
static const QString dataDirectory = QLatin1String(TESTSRCDIR) + QLatin1String("/data");
static const QString dataDirectory = QLatin1String(SRCDIR "/data");
QString result = dataDirectory;
if (!name.isEmpty()) {
result += QLatin1Char('/');

5
tests/auto/cplusplus/preprocessor/preprocessor.pro
View File

@@ -1,7 +1,10 @@
include(../../qttest.pri)
include(../shared/shared.pri)
SOURCES += tst_preprocessor.cpp
# Inject the source dir for referencing test data from shadow builds.
DEFINES += SRCDIR=\\\"$$PWD\\\"
SOURCES += tst_preprocessor.cpp
OTHER_FILES = \
data/noPP.1.cpp \
data/noPP.2.cpp \

4
tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
View File

@@ -39,7 +39,7 @@ using namespace CPlusPlus;
QByteArray loadSource(const QString &fileName)
{
QFile inf(fileName);
QFile inf(QLatin1String(SRCDIR) + QLatin1Char('/') + fileName);
if (!inf.open(QIODevice::ReadOnly | QIODevice::Text)) {
qDebug("Cannot open \"%s\"", fileName.toUtf8().constData());
return QByteArray();
@@ -53,7 +53,7 @@ QByteArray loadSource(const QString &fileName)
void saveData(const QByteArray &data, const QString &fileName)
{
QFile inf(fileName);
QFile inf(QLatin1String(SRCDIR) + QLatin1Char('/') + fileName);
if (!inf.open(QIODevice::WriteOnly | QIODevice::Text)) {
qDebug("Cannot open \"%s\"", fileName.toUtf8().constData());
return;