diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 07:15:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 07:15:00 (GMT) |
| commit | 51684a152f380ed86bb45303871c0881f138d6d9 (patch) | |
| tree | 9afce594ecbf1685863f13f342b1c5608c49c7fa /tools/qml/main.cpp | |
| parent | b80c3b1b04c35ae1fa6d7119b6f7dac06ee6494b (diff) | |
| parent | 5c830ed2a612b940c377fb4e8a2372655f175707 (diff) | |
| download | Qt-51684a152f380ed86bb45303871c0881f138d6d9.zip Qt-51684a152f380ed86bb45303871c0881f138d6d9.tar.gz Qt-51684a152f380ed86bb45303871c0881f138d6d9.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QmlDebug: Fix QmlOstPlugin compilation failure
QmlDebug: Fix QmlOstPlugin compilation failure
Enable performance monitoring at application startup.
Augment documentation
QmlDebugger: removing slots in Live Preview
QmlDebugger: adding slots to items in Live Preview
Fixed license header
Fixed compile on Windows
Added forgotten file qdeclarativeobserverinterface_p.h
Removed some trailing whitespace
Introduced a CONFIG option that enables declarative debug services
Moved the QML Observer Service and related functionality into Qt
QDeclarativeDebugServer: Send hello answer before any service messages
Removed some superfluous semicolons
Diffstat (limited to 'tools/qml/main.cpp')
| -rw-r--r-- | tools/qml/main.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 24a4940..3b20996 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -52,7 +52,6 @@ #include <QAtomicInt> #include <QLibraryInfo> #include "qdeclarativetester.h" -#include <private/qdeclarativedebughelper_p.h> QT_USE_NAMESPACE @@ -539,8 +538,6 @@ int main(int argc, char ** argv) QApplication::setGraphicsSystem(QLatin1String("raster")); #endif - QDeclarativeDebugHelper::enableDebugging(); - Application app(argc, argv); app.setApplicationName(QLatin1String("QtQmlViewer")); app.setOrganizationName(QLatin1String("Nokia")); |