diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-13 11:30:46 (GMT) |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-13 11:30:46 (GMT) |
| commit | 50ea2454c0ad9b28be6dd5125c74466f0f96d16a (patch) | |
| tree | 610e8b4852bca7d23ec5c4b9937a119eed96a124 /tools | |
| parent | 0f750aec4507fffc06acea46a513c6d374564d6a (diff) | |
| parent | a80130b07c5b8ee4b06eabbceb65eb23d4d4602e (diff) | |
| download | Qt-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.zip Qt-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.tar.gz Qt-50ea2454c0ad9b28be6dd5125c74466f0f96d16a.tar.bz2 | |
Merge remote-tracking branch 'qt/4.8'
Conflicts:
src/s60installs/eabi/QtOpenGLu.def
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 3 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 2 |
2 files changed, 1 insertions, 4 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")); diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index defc368..3d1b84b 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qt uic +CONFIG += qt uic declarative_debug DESTDIR = ../../bin include(qml.pri) |