From 8959874793ee6d5a62b348b2de45b9ca4fce494d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 18 Nov 2010 19:33:40 +0100 Subject: [PATCH 01/12] fix ts targets under windows --- share/qtcreator/translations/translations.pro | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) 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 \ From 33ac00afbe859d90f706fdbddd3e144bdc7d9602 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 19 Nov 2010 16:22:14 +0100 Subject: [PATCH 02/12] Doc: replace Qt SDK product name with a macro Reviewed-by: Oswald Buddenhagen --- doc/maemodev.qdoc | 18 +++++++++--------- doc/qtcreator.qdoc | 36 ++++++++++++++++++------------------ doc/qtcreator.qdocconf | 1 + doc/symbiandev.qdoc | 36 ++++++++++++++++++++++-------------- 4 files changed, 50 insertions(+), 41 deletions(-) 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 48fd5d24ba7..138cfb83d20 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} @@ -3596,7 +3596,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 @@ -3609,9 +3609,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. @@ -3650,7 +3650,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. @@ -5408,7 +5408,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"}. @@ -5854,7 +5854,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 @@ -7269,7 +7269,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 e7079b74f7e..0a3e8d64fb8 100644 --- a/doc/qtcreator.qdocconf +++ b/doc/qtcreator.qdocconf @@ -87,6 +87,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..0ee22fc4c2c 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) @@ -63,9 +63,10 @@ \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) @@ -75,7 +76,7 @@ \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: From eab1b49dcd82254dcd997e643732cfeba9274153 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 19 Nov 2010 16:23:09 +0100 Subject: [PATCH 03/12] Doc: fix a link to Qt 4.7 Reviewed-by: Oswald Buddenhagen --- doc/symbiandev.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc index 0ee22fc4c2c..7e5689a8b9d 100644 --- a/doc/symbiandev.qdoc +++ b/doc/symbiandev.qdoc @@ -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 From b954eb199083cc54ba804a4aa832e3396da2b016 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 19 Nov 2010 16:23:36 +0100 Subject: [PATCH 04/12] Doc: modify text because Qt SDK contents have changed Reviewed-by: Oswald Buddenhagen --- doc/symbiandev.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/symbiandev.qdoc b/doc/symbiandev.qdoc index 7e5689a8b9d..46dceac4436 100644 --- a/doc/symbiandev.qdoc +++ b/doc/symbiandev.qdoc @@ -71,7 +71,7 @@ \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 From fabaffde4f83923e5a52d13a0abfdfd38d9d2d34 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Mon, 22 Nov 2010 11:06:45 +0100 Subject: [PATCH 05/12] Do not link against (the possibly absent) eiksrv.dso The template .pri file of the "Qt Quick Application" and "Qt Mobile Application" wizards linked against eiksrv when locking the screen orientation. That is however not necessary. The real problem is that eiksrv does not get shipped with the Symbian^1 SDK in Nokia Qt SDK 1.0/1.1. Therefore, the innecessary link attempt even fails. This patch removes the -leiksrv and bumps the version for the template. Cherrypicking into qtcreator/2.1 is highly recommended. Task-Number: QTCREATORBUG-3142 Task-Number: QTSDK-194 --- share/qtcreator/templates/shared/deployment.pri | 2 +- src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri index e65eeb335c9..f57225e3db8 100644 --- a/share/qtcreator/templates/shared/deployment.pri +++ b/share/qtcreator/templates/shared/deployment.pri @@ -21,7 +21,7 @@ MAINPROFILEPWD = $$PWD symbian { ICON = $${TARGET}.svg TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -leiksrv -lcone + contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -lcone contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices } else:win32 { !isEqual(PWD,$$OUT_PWD) { diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp index 01e32da9b01..1160db6d3f5 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileapp.cpp @@ -65,7 +65,7 @@ const QString AbstractMobileApp::ProFileComment(QLatin1String("#")); const QString AbstractMobileApp::DeploymentPriFileName(QLatin1String("deployment.pri")); const QString AbstractMobileApp::FileChecksum(QLatin1String("checksum")); const QString AbstractMobileApp::FileStubVersion(QLatin1String("version")); -const int AbstractMobileApp::StubVersion = 1; +const int AbstractMobileApp::StubVersion = 2; AbstractMobileApp::AbstractMobileApp() : m_orientation(ScreenOrientationAuto), m_networkEnabled(false) From d47a2c56d1d48baa0ac3e2a771b7bba0b1f4d47b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 19 Nov 2010 16:03:12 +0100 Subject: [PATCH 06/12] Bauhaus: Remove invalid image file Requested-by: Maurice Kalinowski --- src/tools/qml/standalone/32xBauhaus_Logo.png | Bin 36752 -> 0 bytes src/tools/qml/standalone/bauhaus.qrc | 1 - src/tools/qml/standalone/main.cpp | 1 - 3 files changed, 2 deletions(-) delete mode 100644 src/tools/qml/standalone/32xBauhaus_Logo.png diff --git a/src/tools/qml/standalone/32xBauhaus_Logo.png b/src/tools/qml/standalone/32xBauhaus_Logo.png deleted file mode 100644 index 81aabba9d04036da2b2b1781486c4471c5fb4f4e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36752 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 z1Htemplates/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"); From fa7d22e34888f517237861950f13efca2e40681f Mon Sep 17 00:00:00 2001 From: dt Date: Mon, 22 Nov 2010 13:43:21 +0100 Subject: [PATCH 07/12] Qt4ProjectManager: Do not enumerate files from cumulatively found folders Ignore folders 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. Task-Nr: QTCREATORBUG-3104 Reviewed-By: con Reviewed-By: Alessandro Portale --- src/plugins/qt4projectmanager/qt4nodes.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt4nodes.cpp b/src/plugins/qt4projectmanager/qt4nodes.cpp index 7eca9d59bcc..b5601ed2ac2 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 } From e94990f15e58fe034e47e82a8f914effd94598a8 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 22 Nov 2010 15:08:15 +0100 Subject: [PATCH 08/12] Code model: Fix endless loop in AbstractEditorSupport::functionAt used by CDB debugger tooltip (introduced by A 354b9712e4655040930a9f18de4e6b4c71dc42d9). Reviewed-by: Christian Kamm Rubber-stamped-by: dt --- src/plugins/cpptools/abstracteditorsupport.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) 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; From a0dc497935cff83bf0c3d2594d844823a9fe6d5b Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Mon, 22 Nov 2010 14:57:14 +0100 Subject: [PATCH 09/12] QmlProject: Fix creator becoming unresponsive if filesystem changes Buffer update calls to the project tree. Otherwise large updates (e.g. renaming a directory) will block QtCreator for up to several minutes. Reviewed-by: ckamm --- .../fileformat/filefilteritems.cpp | 14 +++++++++++++- .../qmlprojectmanager/fileformat/filefilteritems.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index d78a3ebac93..85bcff190d5 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 @@ -155,6 +158,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 ec27e1cd264..42a244e5d41 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; @@ -74,6 +76,7 @@ private: QSet m_files; FileSystemWatcher m_dirWatcher; + QTimer m_updateFileListTimer; friend class ProjectItem; From 32dd271aa9f700a9c92d1a7d87160a72e2653782 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 22 Nov 2010 15:38:21 +0100 Subject: [PATCH 10/12] Symbian: Unset SBS_HOME when not needed Unset SBS_HOME when none is needed. This prevents SBS from getting confused about where its dependencies are located. Task-number: QTCREATORBUG-3145 Reviewed-by: Alessandro Portale --- src/plugins/qt4projectmanager/qtversionmanager.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/qt4projectmanager/qtversionmanager.cpp b/src/plugins/qt4projectmanager/qtversionmanager.cpp index 2a3b961b039..62105009948 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.cpp +++ b/src/plugins/qt4projectmanager/qtversionmanager.cpp @@ -1603,10 +1603,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")); } From 7e48a3a314bb673aa1dbb00585aaa8d91ebe674a Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 18 Nov 2010 20:29:40 +0100 Subject: [PATCH 11/12] Add some more examples if available (SDK case) Reviewed-by: Alessandro Portale --- .../qtcreator/examplebrowser/qmlexamples.xml | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) 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 @@ + + + - + + + + + + + + + + From 84515448e8d137a6c5218c27bfee84d5241cb327 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 23 Nov 2010 12:14:48 +0100 Subject: [PATCH 12/12] QmlDesigner.rewriter: crash fix for Flipable Removing a property from a Flipabke back or front property resulted in a crash, because the offset of UiObjectBinding was not handled correctly. The left hand side of the binding is not part of the node anymore. Reviewed-by: Kai Koehne --- .../designercore/filemanager/removepropertyvisitor.cpp | 7 +++++++ 1 file changed, 7 insertions(+) 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); }