diff --git a/scripts/mytasks.pl b/scripts/mytasks.pl index d212fde9536..3eaa82099db 100644 --- a/scripts/mytasks.pl +++ b/scripts/mytasks.pl @@ -113,5 +113,5 @@ while () { if ($line =~ /^\+(.*)/) { checkLine($1, $filename, $pos); } -} -close(PIPE); +} +close(PIPE); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp index e850552ac88..5c090c1d675 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.cpp @@ -53,7 +53,7 @@ bool PositionerNodeInstance::isResizable() const } PositionerNodeInstance::Pointer PositionerNodeInstance::create(QObject *object) -{ +{ QQuickBasePositioner *positioner = qobject_cast(object); Q_ASSERT(positioner); diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp index 1138bdd7f71..24b9b2867cc 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp @@ -928,7 +928,7 @@ static inline QString fixComponentPathForIncompatibleQt(const QString &component } QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QDeclarativeContext *context) -{ +{ QDeclarativeComponent component(context->engine(), QUrl::fromLocalFile(fixComponentPathForIncompatibleQt(componentPath))); QObject *object = component.beginCreate(context); diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h index bdce9b279e8..e79dc8af35b 100644 --- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlgraphicsitemnodeinstance.h @@ -84,7 +84,7 @@ protected: QDeclarativeItem *qmlGraphicsItem() const; QDeclarativeAnchors *anchors() const; void resetHorizontal(); - void resetVertical(); + void resetVertical(); void refresh(); void recursiveDoComponentComplete(QDeclarativeItem *declarativeItem); diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml index c292e93bd6c..3d3dc135f7b 100644 --- a/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml +++ b/share/qtcreator/templates/wizards/qtcreatorplugin/wizard.xml @@ -29,9 +29,9 @@ ** ****************************************************************************/ -Custom project wizard configuration example file. Note that by convention, +Custom project wizard configuration example file. Note that by convention, the project file goes last. -The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and +The "class" and "firstpage" attributes specify that it is a Qt 4 wizard and leave room for the Qt 4 target page. --> Qt3Support module - diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp index c1f7c914562..21afdb64777 100644 --- a/tests/auto/cplusplus/ast/tst_ast.cpp +++ b/tests/auto/cplusplus/ast/tst_ast.cpp @@ -72,7 +72,7 @@ public: TranslationUnit *parseStatement(const QByteArray &source) { return parse(source, TranslationUnit::ParseStatement); } - + class Diagnostic: public DiagnosticClient { public: int errorCount; @@ -92,8 +92,8 @@ public: } }; - Diagnostic diag; - + Diagnostic diag; + private slots: void initTestCase(); diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp index ec185ee051f..1527f002574 100644 --- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp +++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp @@ -252,7 +252,7 @@ void tst_CodeFormatter::ifStatementWithoutBraces1() << Line(" while (e)") << Line(" bar;") << Line(" else") - << Line(" foo;") + << Line(" foo;") << Line("}") ; checkIndent(data); diff --git a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp index 4e77853dbd0..f3674c0cc94 100644 --- a/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp +++ b/tests/auto/generichighlighter/specificrules/tst_specificrules.cpp @@ -145,7 +145,7 @@ void tst_SpecificRules::testMatch(Rule *rule) } void tst_SpecificRules::testMatch(Rule *rule, ProgressData *progress) -{ +{ QFETCH(QString, s); QTEST(rule->matchSucceed(s, s.length(), progress), "match"); diff --git a/tests/auto/qtcprocess/qtcprocess.pro b/tests/auto/qtcprocess/qtcprocess.pro index 6c46403de5e..c7d54ae03ca 100644 --- a/tests/auto/qtcprocess/qtcprocess.pro +++ b/tests/auto/qtcprocess/qtcprocess.pro @@ -3,7 +3,7 @@ include(../qttest.pri) win32:DEFINES += _CRT_SECURE_NO_WARNINGS -SOURCES += tst_qtcprocess.cpp +SOURCES += tst_qtcprocess.cpp DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII diff --git a/tests/manual/debugger/gui/mainwindow.cpp b/tests/manual/debugger/gui/mainwindow.cpp index e90e09a5eda..4e26ca25601 100644 --- a/tests/manual/debugger/gui/mainwindow.cpp +++ b/tests/manual/debugger/gui/mainwindow.cpp @@ -83,7 +83,7 @@ MainWindow::~MainWindow() } void MainWindow::simpleBP(int inc, const QString &inx) -{ +{ int array[2] = {1,2}; m_w++; QString x = QLatin1String("h\344all\366"); @@ -295,7 +295,7 @@ void MainWindow::on_actionExtTypes_triggered() std::set stdSet; stdSet.insert("s1"); QWidget *ww = this; - QWidget &wwr = *ww; + QWidget &wwr = *ww; QSharedPointer sps(new QString("hallo")); QList > spsl; spsl.push_back(sps); @@ -317,7 +317,7 @@ void MainWindow::on_actionExtTypes_triggered() QList > nestedIntList; nestedIntList << QList(); - nestedIntList.front() << 1 << 2; + nestedIntList.front() << 1 << 2; QVariantList vList; vList.push_back(QVariant(42)); @@ -360,7 +360,7 @@ void Foo::MainWindow::on_actionScopes_triggered() int x = 2; Q_UNUSED(x) } - qDebug() << x; + qDebug() << x; } void Foo::MainWindow::on_actionLongString_triggered() diff --git a/tests/manual/debugger/gui/tst_gui.cpp b/tests/manual/debugger/gui/tst_gui.cpp index eceef3948ae..5d3fdbb756d 100644 --- a/tests/manual/debugger/gui/tst_gui.cpp +++ b/tests/manual/debugger/gui/tst_gui.cpp @@ -32,7 +32,7 @@ #include "mainwindow.h" int main(int argc, char *argv[]) -{ +{ QApplication a(argc, argv); qDebug() << "pid=" << QApplication::applicationPid(); Foo::MainWindow w; diff --git a/tests/manual/ssh/sftp/sftp.pro b/tests/manual/ssh/sftp/sftp.pro index eb5b7d8e3b8..abb26a865cb 100644 --- a/tests/manual/ssh/sftp/sftp.pro +++ b/tests/manual/ssh/sftp/sftp.pro @@ -1,6 +1,6 @@ include(../ssh.pri) -TARGET=sftp -SOURCES=main.cpp sftptest.cpp argumentscollector.cpp -HEADERS=sftptest.h argumentscollector.h parameters.h +TARGET = sftp +SOURCES = main.cpp sftptest.cpp argumentscollector.cpp +HEADERS = sftptest.h argumentscollector.h parameters.h