diff --git a/doc/maemodev.qdoc b/doc/maemodev.qdoc index 3dd1681c57b..18cc4af9d96 100644 --- a/doc/maemodev.qdoc +++ b/doc/maemodev.qdoc @@ -45,10 +45,10 @@ Maemo is a software platform developed by Nokia for smartphones and Internet Tablets. The Maemo SDK provides an open development environment for different applications on top of the Maemo platform. The necessary - tools from the Maemo SDK are also included in the Nokia Qt SDK. + tools from the Maemo SDK are also included in the \QSDK. The whole tool chain that you need to create, build, debug, run, and deploy - Maemo applictions is installed and configured when you install the Nokia - Qt SDK. + Maemo applictions is installed and configured when you install the + \QSDK. \if defined(qcmanual) Maemo 5 is based on the Linux 2.6 operating system. For more @@ -70,7 +70,7 @@ \if defined(qcmanual) \o MADDE cross-platform Maemo development - tool (installed as part of the Nokia Qt SDK). + tool (installed as part of the \QSDK). For more information about MADDE pertaining to its installation, configuration, and deployment on the device, see @@ -81,7 +81,7 @@ Only needed if you develop on Windows and if you use a USB connection to run applications on the device. The drivers are - installed as part of the Nokia Qt SDK. You can also download them from + installed as part of the \QSDK. You can also download them from \l{https://garage.maemo.org/frs/?group_id=801&release_id=2655}{PC Connectivity} on the Maemo web site. Download and install the latest PC_Connectivity_.exe (at the time of writing, @@ -232,7 +232,7 @@ \if defined(qcmanual) \section1 Setting Up MADDE - If you install Nokia Qt SDK, the MADDE package is installed and + If you install \QSDK, the MADDE package is installed and configured automatically on your development PC and you can omit this task. \list 1 @@ -275,7 +275,7 @@ devices, you must set up a connection to the emulator and the device in the Qt Creator build and run settings. \if defined(qcmanual) - If you install Nokia Qt SDK, the + If you install \QSDK, the necessary software is installed and configured automatically and you only need to configure a connection to the device. @@ -353,7 +353,7 @@ \endlist - If you installed the Nokia Qt SDK, a connection has been configured + If you installed the \QSDK, a connection has been configured and you only need to specify the password and deploy the SSH key. \o To deploy applications and run them remotely, specify parameters @@ -417,7 +417,7 @@ \else - The Nokia Qt SDK installation program configured a default connection + The \QSDK installation program configured a default connection to the Maemo emulator. You only need to specify the password and deploy the SSH key. diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 430ffc40a44..d8c07a781b0 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -67,7 +67,7 @@ \list \o \l{Building and Running an Example Application} \o \l{Creating a Qt C++ Application} - \o \l{Creating a Mobile Application with Nokia Qt SDK} + \o \l{Creating a Mobile Application with Qt SDK} \o \l{Creating a Qt Quick Application} \endlist \o \l{Managing Projects} @@ -196,7 +196,7 @@ system that you use. Qt Creator provides support for building and running Qt applications for - desktop environment and mobile devices. When you install the Nokia Qt SDK, + desktop environment and mobile devices. When you install the \QSDK, the build and run settings for the Maemo and Symbian targets are set up automatically. However, you need to install and configure some additional software on the devices. @@ -372,7 +372,7 @@ can change the information that the device has about its configuration and environment. - The Qt Simulator is installed as part of the Nokia Qt SDK. After it is + The Qt Simulator is installed as part of the \QSDK. After it is installed, you can select it as a build target in Qt Creator. \section1 Debuggers @@ -422,7 +422,7 @@ deeper understanding is used to present objects of such classes in a useful way. - If you install Qt Creator as part of a Qt SDK, the GNU Symbolic Debugger + If you install Qt Creator as part of a \QSDK, the GNU Symbolic Debugger is installed automatically and you should be ready to start debugging after you create a new project. However, you can change the setup to use debugging tools for Windows, for example. @@ -797,7 +797,7 @@ \section1 Finding Information in Qt Documentation - Qt Creator, Qt SDK, Nokia Qt SDK and other Qt deliverables contain documentation + Qt Creator, \QSDK and other Qt deliverables contain documentation as .qch files. All the documentation is accessible in the \gui Help mode. To find information in the documentation, select: @@ -2635,7 +2635,7 @@ \section3 Troubleshooting MinGW Compilation Errors If error messages displayed in the \gui {Compile Output} pane contain - paths where slashes are missing (for example, C:NokiaQtSDK), + paths where slashes are missing (for example, C:QtSDK), check your PATH variable. At the command line, enter the following commands: \code @@ -2874,7 +2874,7 @@ \title Building and Running Applications Qt Creator provides support for building and running Qt applications for - desktop environment and mobile devices. When you install the Nokia Qt SDK, + desktop environment and mobile devices. When you install the \QSDK, the build and run settings for the Maemo and Symbian targets are set up automatically. @@ -3112,11 +3112,11 @@ devices, such as S60 3rd Edition or S60 5th Edition devices. \note Remote Compiler is an experimental component that you must install - separately from the package that is included in the Nokia Qt SDK. + separately from the package that is included in the \QSDK. \list 1 - \o In the Nokia Qt SDK installation directory, double-click + \o In the \QSDK installation directory, double-click SDKMaintenanceTool.exe to install \gui {Experimental APIs}. \o In Qt Creator, choose \gui {Tools > Options > Projects > Remote Compiler} @@ -3594,7 +3594,7 @@ \list \o \l{Building and Running an Example Application} \o \l{Creating a Qt C++ Application} - \o \l{Creating a Mobile Application with Nokia Qt SDK} + \o \l{Creating a Mobile Application with Qt SDK} \o \l{Creating a Qt Quick Application} \endlist @@ -3607,9 +3607,9 @@ \page creator-mobile-example.html \nextpage creator-qml-application.html - \title Creating a Mobile Application with Nokia Qt SDK + \title Creating a Mobile Application with Qt SDK - \note To complete this tutorial, you must install Nokia Qt SDK. + \note To complete this tutorial, you must install \QSDK. The installation program installs and configures the necessary tool chains for mobile application development. @@ -3648,7 +3648,7 @@ and click \gui{Next}. \note Targets are listed if you installed the appropriate development - environment, for example, as part of the Nokia Qt SDK. You can add targets + environment, for example, as part of the \QSDK. You can add targets later in the \gui Projects mode. The \gui {Application Options} dialog opens. @@ -5406,7 +5406,7 @@ \note Visual Studio does not include the Debugging tools needed, and therefore, you must install them separately. - The pre-built \e{Qt SDK for Windows} makes use + The pre-built \QSDK for Windows makes use of the library if it is present on the system. When manually building Qt Creator using the Microsoft Visual C++ Compiler, the build process checks for the required files in \c{"%ProgramFiles%\Debugging Tools for Windows"}. @@ -5852,7 +5852,7 @@ During debugging with the C++ based debugging helpers, Qt Creator dynamically loads a helper library in form of a DLL or a shared object into the debugged process. - The Qt SDK package already contains a prebuilt debugging helper + The \QSDK package already contains a prebuilt debugging helper library. To create your own debugging helper library, select \gui{Tools} > \gui{Options...} > \gui{Qt4} > \gui{Qt Versions}. As the internal data structures of Qt can change between versions, the debugging helper @@ -7267,7 +7267,7 @@ instead. For more information, see the \l{http://doc.qt.nokia.com/qt-simulator-beta/index.html}{Qt Simulator Manual}. - The Maemo emulator is installed and configured as part of the Nokia Qt SDK + The Maemo emulator is installed and configured as part of the \QSDK package. You can also install and configure the MADDE environment and Maemo emulator separately. For more information, see \l{Setting Up Development Environment for Maemo}. @@ -8413,10 +8413,10 @@ \o Building and packaging subprojects is not supported for Maemo devices. \o You must create projects for Maemo targets on the same partition where - you installed Nokia Qt SDK, Qt Creator, and MADDE. + you installed \QSDK, Qt Creator, and MADDE. \o If error messages displayed in the \gui {Compile Output} pane contain - paths where slashes are missing (for example, C:NokiaQtSDK), + paths where slashes are missing (for example, C:QtSDK), check your PATH variable. For more information, see \l{Troubleshooting MinGW Compilation Errors}. diff --git a/doc/qtcreator.qdocconf b/doc/qtcreator.qdocconf index 9e8df7cefaa..1959c623e6c 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -89,6 +89,7 @@ macro.QL = "\\e{Qt Linguist}" macro.QC = "\\e{Qt Creator}" macro.QMLD = "\\e{Qt Quick Designer}" macro.QQV = "\\e{Qt QML Viewer}" +macro.QSDK = "\\e{Qt SDK}" macro.param = "\\e" macro.raisedaster.HTML = "*" macro.reg.HTML = "®" diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc index 50a91804561..46dceac4436 100644 --- a/doc/symbiandev.qdoc +++ b/doc/symbiandev.qdoc @@ -30,7 +30,7 @@ \if defined(qcmanual) \previouspage creator-developing-maemo.html \else - \previouspage nokiaqtsdk-gs.html + \previouspage sdk-gs.html \endif \page creator-developing-symbian.html \if defined(qcmanual) @@ -44,7 +44,7 @@ For more information about developing applications for the Symbian platform, select \gui {Help > Index} and look for \gui {Platform Notes}, or see - \l{http://doc.qt.nokia.com/4.6/platform-notes-symbian.html}{Platform Notes - Symbian}. + \l{http://doc.qt.nokia.com/4.7/platform-notes-symbian.html}{Platform Notes - Symbian}. \section1 Hardware and Software Requirements @@ -63,19 +63,20 @@ \endif application for your device \o The \e{qt_installer.sis} package installed on the device, that is - delivered with the Qt SDK + delivered with the \QSDK \o \e {Qt Mobility APIs} installed on the device, if you use them in applications + \o \QQV to run Qt Quick applications on Symbian^3 devices. \endlist \if defined(qcmanual) To run your applications in the Symbian emulator, you also need - to install a Symbian Platform SDK and Carbide.c++ v2.0.0 or higher. + to install Carbide.c++ v2.0.0 or higher. \endif \section1 Installing Required Applications on Devices - The Nokia Qt SDK installation program creates shortcuts for installing + The \QSDK installation program creates shortcuts for installing the required applications on Symbian devices (you can also use any of the standard methods for installing applications on devices): @@ -86,17 +87,24 @@ or PC Suite, all the necessary drivers are installed automatically. This takes approximately one minute. - \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install Qt to Symbian - device} and follow the instructions on the screen to install Qt 4.6.2 - libraries on the device. + \o Choose \gui {Start > Qt SDK > Symbian > Install Qt 4.7.1 to Symbian^1 + Device} or \gui {Install Qt 4.7.1 to Symbian^3 Device}, depending on the + device type. Follow the instructions on the screen to install Qt + libraries to the device. - \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install QtMobility to Symbian - device} and follow the instructions on the screen to install Qt - mobility libraries on the device. + \o Choose \gui {Start > Qt SDK > Symbian > Install QtMobility 1.1.0 to + Symbian^1 Device} or \gui {Install QtMobility 1.1.0 to Symbian^3 Device} + and follow the instructions on the screen to install Qt + mobility libraries to the device. - \o Choose \gui {Start > Nokia Qt SDK > Symbian > Install TRK to Symbian - device} and follow the instructions on the screen to install the TRK - debugging application on the device. + \o Choose \gui {Start > Qt SDK > Symbian > Install TRK (Debug Agent) + to Symbian^1 Device} or \gui {Install TRK (Debug Agent) to Symbian^3 + Device} and follow the instructions on the screen to install the TRK + debugging application to the device. + + \o Choose \gui {Start > Qt SDK > Symbian > Install QML Viewer + to Symbian^3 Device} and follow the instructions on the screen to + install \QQV to the device. \note To check the Symbian platform version of your device, see \l{http://www.forum.nokia.com/devices}{Device Details}. @@ -104,13 +112,13 @@ \endlist \note If errors occur during the installation, copy the .sis files from - \c {\Symbian\sis} to the device using USB storage + \c {\Symbian\sis} to the device using USB storage mode. Then install them from the file manager on the device. \if defined(qcmanual) \section1 Adding Symbian Platform SDKs - Nokia Qt SDK contains all the tools you need for developing Qt applications for + \QSDK contains all the tools you need for developing Qt applications for Symbian devices. To use Symbian APIs directly in your applications, you can install additional Symbian Platform SDKs: diff --git a/share/qtcreator/examplebrowser/qmlexamples.xml b/share/qtcreator/examplebrowser/qmlexamples.xml index c12744fe52e..af01655fb62 100644 --- a/share/qtcreator/examplebrowser/qmlexamples.xml +++ b/share/qtcreator/examplebrowser/qmlexamples.xml @@ -19,16 +19,32 @@ + + + + + + + + + + + + + + + + @@ -36,6 +52,8 @@ + + @@ -44,12 +62,24 @@ + + + - + + + + + + + + + + diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro index 49ef9fdf087..04092179799 100644 --- a/share/qtcreator/translations/translations.pro +++ b/share/qtcreator/translations/translations.pro @@ -13,6 +13,8 @@ LUPDATE = $$targetPath($$[QT_INSTALL_BINS]/lupdate) -locations relative -no-ui-l LRELEASE = $$targetPath($$[QT_INSTALL_BINS]/lrelease) LCONVERT = $$targetPath($$[QT_INSTALL_BINS]/lconvert) +wd = $$replace(IDE_SOURCE_TREE, /, $$QMAKE_DIR_SEP) + TRANSLATIONS = $$prependAll(LANGUAGES, $$PWD/qtcreator_,.ts) MIME_TR_H = $$OUT_PWD/mime_tr.h @@ -30,7 +32,8 @@ extract.commands += \ QMAKE_EXTRA_TARGETS += extract plugin_sources = $$files($$IDE_SOURCE_TREE/src/plugins/*) -plugin_sources ~= s,^$$re_escape($$IDE_SOURCE_TREE/),,g +win32:plugin_sources ~= s,\\\\,/,g +plugin_sources ~= s,^$$re_escape($$IDE_SOURCE_TREE/),,g$$i_flag plugin_sources -= src/plugins/plugins.pro \ src/plugins/helloworld \ # just an example # the following ones are dead @@ -43,28 +46,27 @@ files = $$files($$PWD/*_??.ts) $$PWD/qtcreator_untranslated.ts for(file, files) { lang = $$replace(file, .*_([^/]*)\\.ts, \\1) v = ts-$${lang}.commands - $$v = cd $$IDE_SOURCE_TREE && $$LUPDATE $$sources $$MIME_TR_H $$CUSTOMWIZARD_TR_H -ts $$file + $$v = cd $$wd && $$LUPDATE $$sources $$MIME_TR_H $$CUSTOMWIZARD_TR_H -ts $$file v = ts-$${lang}.depends $$v = extract QMAKE_EXTRA_TARGETS += ts-$$lang } -ts-all.commands = cd $$IDE_SOURCE_TREE && $$LUPDATE $$sources $$MIME_TR_H $$CUSTOMWIZARD_TR_H -ts $$files +ts-all.commands = cd $$wd && $$LUPDATE $$sources $$MIME_TR_H $$CUSTOMWIZARD_TR_H -ts $$files ts-all.depends = extract QMAKE_EXTRA_TARGETS += ts-all -check-ts.commands = (cd $$PWD && perl check-ts.pl) +check-ts.commands = (cd $$replace(PWD, /, $$QMAKE_DIR_SEP) && perl check-ts.pl) check-ts.depends = ts-all QMAKE_EXTRA_TARGETS += check-ts isEqual(QMAKE_DIR_SEP, /) { commit-ts.commands = \ - cd $$IDE_SOURCE_TREE; \ + cd $$wd; \ for f in `git diff-files --name-only share/qtcreator/translations/*_??.ts`; do \ $$LCONVERT -locations none -i \$\$f -o \$\$f; \ done; \ git add share/qtcreator/translations/*_??.ts && git commit } else { - wd = $$replace(IDE_SOURCE_TREE, /, \\) commit-ts.commands = \ cd $$wd && \ for /f usebackq %%f in (`git diff-files --name-only share/qtcreator/translations/*_??.ts`) do \ diff --git a/src/plugins/cpptools/abstracteditorsupport.cpp b/src/plugins/cpptools/abstracteditorsupport.cpp index e29f45f2fb2..e8f42be2394 100644 --- a/src/plugins/cpptools/abstracteditorsupport.cpp +++ b/src/plugins/cpptools/abstracteditorsupport.cpp @@ -73,17 +73,14 @@ QString AbstractEditorSupport::functionAt(const CppModelManagerInterface *modelM const CPlusPlus::Overview o; QString rc = o.prettyName(function->name()); // Prepend namespace "Foo::Foo::foo()" up to empty root namespace - for (const CPlusPlus::Symbol *owner = function; ; ) { - if (const CPlusPlus::Scope *nameSpace = owner->enclosingNamespace()) { - const QString name = o.prettyName(nameSpace->name()); - if (name.isEmpty()) { - break; - } else { - rc.prepend(QLatin1String("::")); - rc.prepend(name); - } - } else { + for (const CPlusPlus::Symbol *owner = function->enclosingNamespace(); + owner; owner = owner->enclosingNamespace()) { + const QString name = o.prettyName(owner->name()); + if (name.isEmpty()) { break; + } else { + rc.prepend(QLatin1String("::")); + rc.prepend(name); } } return rc; diff --git a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp index 136bf85d4c5..449b01d1575 100644 --- a/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp +++ b/src/plugins/qmldesigner/designercore/filemanager/removepropertyvisitor.cpp @@ -48,6 +48,13 @@ RemovePropertyVisitor::RemovePropertyVisitor(QmlDesigner::TextModifier &modifier bool RemovePropertyVisitor::visit(QmlJS::AST::UiObjectBinding *ast) { if (ast->firstSourceLocation().offset == parentLocation) { + //this condition is wrong for the UiObjectBinding case, but we keep it + //since we are paranoid until the release is done. + // FIXME: change this to use the QmlJS::Rewriter class + removeFrom(ast->initializer); + } + + if (ast->qualifiedTypeNameId && ast->qualifiedTypeNameId->identifierToken.offset == parentLocation) { // FIXME: change this to use the QmlJS::Rewriter class removeFrom(ast->initializer); } diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index 95c17189807..3c2ab7c8d9c 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp @@ -8,7 +8,10 @@ FileFilterBaseItem::FileFilterBaseItem(QObject *parent) : QmlProjectContentItem(parent), m_recurse(RecurseDefault) { + m_updateFileListTimer.setSingleShot(true); + m_updateFileListTimer.setInterval(50); connect(&m_dirWatcher, SIGNAL(directoryChanged(QString)), this, SLOT(updateFileList())); + connect(&m_updateFileListTimer, SIGNAL(timeout()), this, SLOT(updateFileListNow())); } QString FileFilterBaseItem::directory() const @@ -32,7 +35,7 @@ void FileFilterBaseItem::setDefaultDirectory(const QString &dirPath) return; m_defaultDir = dirPath; - updateFileList(); + updateFileListNow(); } QString FileFilterBaseItem::filter() const @@ -162,6 +165,15 @@ QString FileFilterBaseItem::absoluteDir() const void FileFilterBaseItem::updateFileList() { + if (!m_updateFileListTimer.isActive()) + m_updateFileListTimer.start(); +} + +void FileFilterBaseItem::updateFileListNow() +{ + if (m_updateFileListTimer.isActive()) + m_updateFileListTimer.stop(); + const QString projectDir = absoluteDir(); if (projectDir.isEmpty()) return; diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h index 2dcd1d557a6..9c69c31bc28 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h @@ -6,6 +6,7 @@ #include #include #include +#include #include "qmlprojectitem.h" #include "filesystemwatcher.h" @@ -49,6 +50,7 @@ signals: private slots: void updateFileList(); + void updateFileListNow(); private: QString absolutePath(const QString &path) const; @@ -77,6 +79,7 @@ private: QSet m_files; FileSystemWatcher m_dirWatcher; + QTimer m_updateFileListTimer; friend class ProjectItem; diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 89a0d8e25aa..93a9ff4bf24 100644 --- a/src/plugins/qt4projectmanager/qt4nodes.cpp +++ b/src/plugins/qt4projectmanager/qt4nodes.cpp @@ -548,8 +548,10 @@ void Qt4PriFileNode::update(ProFile *includeFileExact, ProFileReader *readerExac QStringList dynamicVariables = dynamicVarNames(readerExact, readerCumulative); foreach (const QString &dynamicVar, dynamicVariables) { folders += readerExact->values(dynamicVar, includeFileExact); - if (readerCumulative) - folders += readerCumulative->values(dynamicVar, includeFileCumlative); + // Ignore stuff from cumulative parse + // we are recursively enumerating all the files from those folders + // and add watchers for them, that's too dangerous if we get the foldrs + // wrong and enumerate the whole project tree multiple times } diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 31a3cc0bcfc..7e384b80e87 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1566,10 +1566,12 @@ void QtVersion::addToEnvironment(Utils::Environment &env) const env.set("QTDIR", QDir::toNativeSeparators(versionInfo().value("QT_INSTALL_DATA"))); if (isBuildWithSymbianSbsV2()) { QString sbsHome(env.value(QLatin1String("SBS_HOME"))); - if (!m_sbsV2Directory.isEmpty()) + if (!m_sbsV2Directory.isEmpty()) { env.prependOrSetPath(m_sbsV2Directory); - else if (!sbsHome.isEmpty()) + env.unset(QLatin1String("SBS_HOME")); // unset SBS_HOME to prevent SBS from picking it up + } else if (!sbsHome.isEmpty()) { env.prependOrSetPath(sbsHome + QLatin1Char('/') + QLatin1String("bin")); + } } env.prependOrSetPath(versionInfo().value("QT_INSTALL_BINS")); } diff --git a/src/tools/qml/standalone/32xBauhaus_Logo.png b/src/tools/qml/standalone/32xBauhaus_Logo.png deleted file mode 100644 index 81aabba9d04..00000000000 Binary files a/src/tools/qml/standalone/32xBauhaus_Logo.png and /dev/null differ diff --git a/src/tools/qml/standalone/bauhaus.qrc b/src/tools/qml/standalone/bauhaus.qrc index 223d7115a1f..51bf9077749 100644 --- a/src/tools/qml/standalone/bauhaus.qrc +++ b/src/tools/qml/standalone/bauhaus.qrc @@ -14,6 +14,5 @@ templates/fx.qml 16xBauhaus_Logo.png 256xBauhaus_Logo.png - 32xBauhaus_Logo.png diff --git a/src/tools/qml/standalone/main.cpp b/src/tools/qml/standalone/main.cpp index 04491cd98b6..ff9d8a0b781 100644 --- a/src/tools/qml/standalone/main.cpp +++ b/src/tools/qml/standalone/main.cpp @@ -129,7 +129,6 @@ int main(int argc, char *argv[]) #ifdef Q_WS_X11 QIcon applicationIcon; applicationIcon.addFile(":/16xBauhaus_Log"); - applicationIcon.addFile(":/32xBauhaus_Logo.png"); applicationIcon.addFile(":/64xBauhaus_Logo.png"); applicationIcon.addFile(":/128xBauhaus_Logo.png"); applicationIcon.addFile(":/256xBauhaus_Logo.png");