From 2aa7ed7a06fe79dc8729e29a7ea4850dd9eceb1f Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 5 Oct 2017 15:14:29 +0200 Subject: [PATCH 01/17] QmlDesigner: Fix compile with Qt 5.10 The QtQuick include at this point for some reasons tries to include not existing Vulcan headers. Change-Id: Ie2dc667b3438a2bbf7e8f251520502a836b109db Reviewed-by: Eike Ziller --- .../qmldesigner/components/itemlibrary/itemlibrarymodel.h | 2 +- .../qmldesigner/components/itemlibrary/itemlibrarywidget.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h index a61937d9c31..40b9e55b738 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include QT_FORWARD_DECLARE_CLASS(QMimeData) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 8e3ef4418ac..4364983608c 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -41,6 +41,7 @@ #include #include "rewritingexception.h" +#include #include #include #include @@ -54,6 +55,7 @@ #include #include #include +#include #include namespace QmlDesigner { From a251cfc6aadb80f47a25c7174fd8e715824c16ca Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 6 Oct 2017 10:09:16 +0200 Subject: [PATCH 02/17] QmlDesigner: Fix missing include Change-Id: Ic445036d3ab6f0b673d8541322c0631ced0aeb91 Reviewed-by: Tim Jenssen (cherry picked from commit 8b32ff9343de80b61ce4c7dc29b787a246f263b5) Reviewed-by: Eike Ziller --- .../components/itemlibrary/itemlibrarysectionmodel.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp index 7e36801a833..1ed8d16e1ed 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarysectionmodel.cpp @@ -27,6 +27,8 @@ #include "itemlibraryitem.h" +#include + namespace QmlDesigner { ItemLibrarySectionModel::ItemLibrarySectionModel(QObject *parent) : From 7a8890f50192b307dc0af2ab475dc802bec58cd9 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 8 Sep 2017 06:13:53 +0200 Subject: [PATCH 03/17] Update Polish translations Change-Id: I90b81cec2308a148206e3cd6ec50a8f73ec9f667 Reviewed-by: Michal Klocek --- share/qtcreator/translations/qtcreator_pl.ts | 2518 +++++++++++------- 1 file changed, 1534 insertions(+), 984 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index d70e6539420..4930bb60bcd 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -486,10 +486,6 @@ &Log &Log - - &Checkout - Utwórz &kopię roboczą - Re&name Zmień &nazwę @@ -506,18 +502,10 @@ Cherry pick top commit from selected branch. - - Cherry Pick - - &Track Włącz śl&edzenie - - Reset - Reset - Set current branch to track the selected one. Bieżąca gałąź zacznie śledzić zmiany w zaznaczonej gałęzi. @@ -526,6 +514,22 @@ &Include old entries + + Include ta&gs + + + + C&heckout + + + + Re&set + + + + Cherry &Pick + + Git::Internal::GitSubmitPanel @@ -636,10 +640,6 @@ Command: Komenda: - - Show tags in Branches dialog - Pokazuj tagi w dialogu z gałęziami - Repository Browser Przeglądarka repozytorium @@ -1290,10 +1290,6 @@ Erase background. Wyczyść kolor tła. - - Underline: - Podkreślenie: - No Underline Brak podkreślenia @@ -1322,14 +1318,6 @@ Dash-Dot-Dot Underline Podkreślenie z kresek i dwóch kropek - - Saturation - Nasycenie - - - Lightness - Jasność - Relative Foreground @@ -1338,6 +1326,26 @@ Relative Background + + Lightness: + Jasność: + + + Saturation: + Nasycenie: + + + Font + Czcionka + + + Underline + Podkreślenie + + + Color: + Kolor: + TextEditor::Internal::FontSettingsPage @@ -1650,8 +1658,8 @@ Przyczyna: %3 Zależność: %1 - Dependency: "%1" must be "%2" or "%3" (is "%4") - Zależność: "%1" powinno mieć wartość "%2" lub "%3" (aktualnie ma wartość "%4") + Dependency: "%1" must be "%2" or "%3" (is "%4"). + Zależność: "%1" powinno mieć wartość "%2" lub "%3" (aktualnie ma wartość "%4"). Argument: %1 @@ -2081,6 +2089,10 @@ Przyczyna: %3 Build directory: Katalog wersji: + + Filter + Filtr + &Add &Dodaj @@ -2871,6 +2883,16 @@ Kontynuować? Searching for Usages Wyszukiwanie użyć + + Re&name %1 files + Zmień &nazwę w %1 plikach + + + Files: +%1 + Pliki: +%1 + C++ Macro Usages: Użycia makr C++: @@ -3581,10 +3603,6 @@ Kontynuować? &Condition: &Warunek: - - Breakpoint - Pułapka - Function Funkcja @@ -3782,8 +3800,8 @@ Kontynuować? <html><head/><body><p>Próbuje poprawiać położenie pułapek w liniach, które są komentarzami lub dla których nie wygenerowano kodu. Poprawianie bazuje na modelu kodu.</p></body></html> - Use Python dumper when available - Używaj Python dumpera, jeśli jest dostępny + Use Python dumper + Używaj Python dumpera @@ -4113,10 +4131,6 @@ Kontynuować? Debugger::Internal::GdbEngine - - The last waitFor...() function timed out. The state of QProcess is unchanged, and you can try calling waitFor...() again. - Przekroczono czas oczekiwania na powrót z ostatniego wywołania funkcji waitFor...(). Stan QProcess się nie zmienił, możesz ponownie spróbować wywołać waitFor...(). - Reading %1... Wczytywanie %1... @@ -4153,20 +4167,10 @@ Możesz poczekać dłużej na odpowiedź lub przerwać debugowanie.Running requested... Zażądano uruchomienia... - - An unknown error in the gdb process occurred. - Wystąpił nieznany błąd w procesie gdb. - The gdb process failed to start. Błąd uruchamiania procesu gdb. - - Either the invoked program "%1" is missing, or you may have insufficient permissions to invoke the program. -%2 - Albo brak programu "%1", albo brak uprawnień do jego wykonania. -%2 - An exception was triggered: Rzucono wyjątek: @@ -4331,22 +4335,6 @@ Spróbuj: %2 Stopping temporarily Zatrzymywanie tymczasowe - - The gdb process crashed some time after starting successfully. - Proces gdb przerwał pracę po poprawnym uruchomieniu. - - - The gdb process was ended forcefully - Wymuszono zakończenie procesu gdb - - - An error occurred when attempting to write to the gdb process. For example, the process may not be running, or it may have closed its input channel. - Wystąpił błąd podczas próby pisania do procesu gdb. Być może proces nie jest uruchomiony lub zamknął on swój kanał wejściowy. - - - An error occurred when attempting to read from the gdb process. For example, the process may not be running. - Wystąpił błąd podczas próby czytania z procesu gdb. Być może proces nie jest uruchomiony. - GDB not responding GDB nie odpowiada @@ -4573,22 +4561,6 @@ receives a signal like SIGSEGV during debugging. <html><head/><body><p>GDB commands entered here will be executed after GDB has successfully attached to remote targets.</p><p>You can add commands to further set up the target here, such as "monitor reset" or "load".</body></html> <html><head/><body><p>Wprowadzone tutaj komendy GDB zostaną wykonane zaraz po poprawnym dołączeniu GDB do debugowanego programu. </p><p>Można tutaj dodać dalsze komendy konfigurujące uruchomiony program, takie jak: "monitor reset" lub "load".</body></html> - - Debugging Helper Customization - Konfiguracja programów pomocniczych debuggera - - - <html><head/><body><p>GDB commands entered here will be executed after Qt Creator's debugging helpers have been loaded and fully initialized. You can load additional debugging helpers or modify existing ones here.</p>%1</body></html> - <html><head/><body><p>Wprowadzone tutaj komendy GDB zostaną wykonane zaraz po załadowaniu i zainicjalizowaniu programów pomocniczych debuggera Qt Creatora. Można tutaj załadować dodatkowych asystentów lub zmodyfikować istniejących.</p>%1</body></html> - - - Extra Debugging Helpers - Dodatkowe programy pomocnicze debuggera - - - Path to a Python file containing additional data dumpers. - Ścieżka do pliku Pythona zawierającego dodatkowe skrypty generujące zrzuty danych. - Extended Rozszerzenia @@ -4602,12 +4574,12 @@ receives a signal like SIGSEGV during debugging. <html><head/><body><p>Odblokowuje debugowanie wsteczne. </p><p><b>Uwaga:</b> ta funkcja jest bardzo wolna i niestabilna po stronie GDB. Kroczenie wstecz nad wywołaniami systemowymi zachowuje się w sposób nieprzewidywalny i może łatwo zniszczyć sesję debugową.</p><body></html> - <html><head/><body>Keeps debugging all children after a fork.</body></html> - <html><head/><body>Debuguje wszystkie dzieci po forku.</body></html> + Debug all child processes + Debuguj wszystkie procesy potomne - Debug all children - Debuguj wszystkie dzieci + <html><head/><body>Keeps debugging all children after a fork.</body></html> + <html><head/><body>Debuguje wszystkie dzieci po forku.</body></html> Additional Startup Commands @@ -5034,7 +5006,7 @@ receives a signal like SIGSEGV during debugging. <optimized out> - + <usunięty przy optymalizacji> <%n items> @@ -5195,7 +5167,7 @@ receives a signal like SIGSEGV during debugging. Note: Evaluators will be re-evaluated after each step. For details, see the <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">documentation</a>. - Uwaga: procedury przetwarzającę będą wykonywane po każdym kroku. Szczegóły można sprawdzić w <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">dokumentacji</a>. + Uwaga: procedury przetwarzające będą wykonywane po każdym kroku. Szczegóły można sprawdzić w <a href="qthelp://org.qt-project.qtcreator/doc/creator-debug-mode.html#locals-and-expressions">dokumentacji</a>. New Evaluated Expression @@ -5875,34 +5847,10 @@ Przebudowanie projektu może pomóc w ich odnalezieniu. Create Local Branch Utwórz lokalną gałąź - - Committed %n file(s). - - Utworzono poprawkę ze zmianami w %n pliku. - Utworzono poprawkę ze zmianami w %n plikach. - Utworzono poprawkę ze zmianami w %n plikach. - - - - Amended "%1" (%n file(s)). - - Skorygowano "%1" (%n plik). - Skorygowano "%1" (%n pliki). - Skorygowano "%1" (%n plików). - - Cannot obtain log of "%1": %2 Nie można otrzymać logu "%1": %2 - - Cannot reset %n file(s) in "%1": %2 - - Nie można zresetować %n pliku w "%1": %2 - Nie można zresetować %n plików w "%1": %2 - Nie można zresetować %n plików w "%1": %2 - - Cannot checkout "%1" of %2 in "%3": %4 Meaning of the arguments: %1: revision, %2: files, %3: repository, %4: Error message @@ -5941,6 +5889,27 @@ Przebudowanie projektu może pomóc w ich odnalezieniu. All changes in working directory will be discarded. Are you sure? Wszystkie zmiany w katalogu roboczym zostaną utracone. Czy kontynuować? + + Cannot reset %n files in "%1": %2 + + + + + + + + and %n more + Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" + + i jeszcze %n gałąź + i jeszcze %n gałęzie + i jeszcze %n gałęzi + + + + <None> + <Brak> + Cannot describe revision "%1" in "%2": %3 Nie można opisać wersji "%1" w "%2": %3 @@ -5962,6 +5931,34 @@ Przebudowanie projektu może pomóc w ich odnalezieniu. Would you like to update submodules? Czy uaktualnić podmoduły? + + Committed %n files. + + Utworzono poprawkę ze zmianami w %n pliku. + Utworzono poprawkę ze zmianami w %n plikach. + Utworzono poprawkę ze zmianami w %n plikach. + + + + Amended "%1" (%n files). + + Skorygowano "%1" (%n plik). + Skorygowano "%1" (%n pliki). + Skorygowano "%1" (%n plików). + + + + Cannot commit %n files: %1 + + + Nie można utworzyć poprawki ze zmian w %n pliku: %1 + + Nie można utworzyć poprawki ze zmian w %n plikach: %1 + + Nie można utworzyć poprawki ze zmian w %n plikach: %1 + + + Conflicts Detected Wykryto konflikty @@ -6119,15 +6116,6 @@ Commit now? Amended "%1". Skorygowano "%1". - - Cannot commit %n file(s): %1 - - - Nie można utworzyć poprawki ze zmian w %n pliku: %1 - Nie można utworzyć poprawki ze zmian w %n plikach: %1 - Nie można utworzyć poprawki ze zmian w %n plikach: %1 - - Revert Odwróć zmiany @@ -6411,11 +6399,11 @@ Commit now? <No repository> - <Brak repozytorium> + <Brak repozytorium> Repository: %1 - Repozytorium: %1 + Repozytorium: %1 Reflog @@ -7672,7 +7660,7 @@ Wykluczenia: %2 ProjectExplorer::EnvironmentWidget - &Edit + Ed&it Z&modyfikuj @@ -7879,10 +7867,6 @@ Wykluczenia: %2 Run Uruchom - - Session &Manager... - Za&rządzanie sesjami... - Close All Projects and Editors Zamknij wszystkie projekty i edytory @@ -7992,10 +7976,6 @@ Wykluczenia: %2 The currently active run configuration's name. Nazwa aktywnej konfiguracji uruchamiania. - - The currently active run configuration's executable (if applicable) - Plik wykonywalny aktywnej konfiguracji uruchamiania (jeśli istnieje) - The currently active build configuration's type. Typ aktywnej konfiguracji budowania. @@ -8028,10 +8008,6 @@ Wykluczenia: %2 Do you want to cancel the build process and unload the project anyway? Czy przerwać budowanie i wyładować projekt? - - Failed opening project "%1": Project is not a file - Nie można otworzyć projektu "%1": Ścieżka projektu nie wskazuje na plik - _copy _kopia @@ -8042,7 +8018,7 @@ Wykluczenia: %2 Duplicating File Failed - Błąd powielania pliku + Błąd powielania pliku Could not duplicate the file %1. @@ -8064,6 +8040,10 @@ Wykluczenia: %2 S&essions &Sesje + + &Manage... + Za&rządzaj... + Close Pro&ject "%1" Zamknij pro&jekt "%1" @@ -8072,6 +8052,18 @@ Wykluczenia: %2 Close Pro&ject Zamknij pro&jekt + + Meta+Backspace + Meta+Backspace + + + The currently active run configuration's executable (if applicable). + Plik wykonywalny aktywnej konfiguracji uruchamiania (jeśli istnieje). + + + Failed opening project "%1": Project is not a file. + Nie można otworzyć projektu "%1": Ścieżka projektu nie wskazuje na plik. + Failed opening project "%1": No plugin can open project type "%2". Nie można otworzyć projektu "%1": brak wtyczki obsługującej projekty typu "%2". @@ -8367,6 +8359,10 @@ do projektu "%2". Hide Generated Files Ukryj wygenerowane pliki + + Hide Empty Directories + Ukryj puste katalogi + Synchronize with Editor Synchronizuj z edytorem @@ -8951,7 +8947,7 @@ do projektu "%2". WebEngine and QWidget-based classes using Chromium backend - Klasy WebEngine i klasy bazujące na QWidget, używające back-endu Chromium + Klasy WebEngine i klasy bazujące na QWidget, używające back-endu Chromium Classes for displaying and editing Web content @@ -9445,11 +9441,11 @@ Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dos Przerwano zastępowanie. - %n found + %n found. - %n znaleziony - %n znalezione - %n znalezionych + %n znalezienie. + %n znalezienia. + %n znalezień. @@ -9606,6 +9602,15 @@ Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dos Alt+Return Alt+Return + + Show Context Menu + Pokaż menu podręczne + + + Text + SnippetProvider + Tekst + Selected text within the current document. Zaznacz tekst w bieżącym dokumencie. @@ -10269,6 +10274,10 @@ Nie zostanie zastosowane do białych znaków w komentarzach i ciągach znakowych New Folder Nowy katalog + + Bookmark + Zakładka + ContentWindow @@ -10819,6 +10828,10 @@ Możesz odłożyć zmiany lub je porzucić. qsTranslate() qsTranslate() + + Root Item Init Size + + QmakeProjectManager::Internal::TestWizardPage @@ -12205,16 +12218,16 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM WidgetPluginManager - Failed to create instance of file '%1': %2 + Failed to create instance of file "%1": %2 Nie można utworzyć instancji pliku "%1": %2 - Failed to create instance of file '%1'. + Failed to create instance of file "%1". Nie można utworzyć instancji pliku "%1". - File '%1' is not a QmlDesigner plugin. - Plik "%1" nie jest wtyczką QmlDesigner. + File "%1" is not a Qt Quick Designer plugin. + Plik "%1" nie jest wtyczką Qt Quick Designera. @@ -12224,6 +12237,14 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM Title of Editor widget Stany + + Cannot create QtQuick View + Nie można utworzyć widoku QtQuick + + + StatesEditorWidget: %1 cannot be created. Most likely QtQuick.Controls 1 are not installed. + StatesEditorWidget: nie można utworzyć %1. Najprawdopodobniej QtQuick.Controls 1 nie jest zainstalowany. + QmlDesigner::Internal::DesignModeWidget @@ -12264,7 +12285,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM Inspect API for Element Under Cursor - Odszukaj w API elementu pod kursorem + Odszukaj w API elementu pod kursorem QML @@ -12278,6 +12299,11 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM Find Usages Znajdź użycia + + QML + SnippetProvider + QML + Ctrl+Shift+U Ctrl+Shift+U @@ -12424,11 +12450,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM No qmlscene installed. Brak zainstalowanego "qmlscene". - - Qt for WinCE - Qt Version is meant for WinCE - Qt dla WinCE - Embedded Linux Qt Version is used for embedded Linux development @@ -12724,14 +12745,6 @@ które można ustawić poniżej. Enter the name of the session: Podaj nazwę sesji: - - &Create - &Utwórz - - - Create and &Open - Utwórz i &otwórz - QmlDesigner::Internal::ModelPrivate @@ -12875,18 +12888,6 @@ Jest to niezależne od właściwości dotyczącej widoczności w QML.Use QML emulation layer that is built with the selected Qt Użyj emulatora QML zbudowanego przez wybraną wersję Qt - - Invalid Id - Niepoprawny identyfikator - - - %1 is an invalid id. - %1 nie jest poprawnym identyfikatorem. - - - %1 already exists. - %1 już istnieje. - QmlDesigner::InvalidArgumentException @@ -13607,14 +13608,6 @@ Flagi: %3 There is no CDB executable specified. Brak podanego pliku wykonywalnego CDB. - - Internal error: The extension %1 cannot be found. -If you have updated Qt Creator via Maintenance Tool you may need to rerun the Tool and select "Add or remove components"and then select the -Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component. - Błąd wewnętrzny: nie można odnaleźć rozszerzenia %1. -Jeśli Qt Creator został uaktualniony przy użyciu aktualizatora konieczne może być ponowne uruchomienie narzędzia, wybranie opcji "Dodaj lub usuń komponenty" i zaznaczenie -Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component. - Interrupting is not possible in remote sessions. Przerywanie nie jest możliwe w zdalnych sesjach. @@ -13643,6 +13636,14 @@ Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component.Unsupported CDB host system. System hosta nieobsługiwany przez CDB. + + Internal error: The extension %1 cannot be found. +If you have updated Qt Creator via Maintenance Tool, you may need to rerun the Tool and select "Add or remove components" and then select the +Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component. +If you build Qt Creator from sources and want to use a CDB executable with another bitness than your Qt Creator build, +you will need to build a separate CDB extension with the same bitness as the CDB you want to use. + + Malformed stop response received. Niepoprawna odpowiedź na stop. @@ -13695,41 +13696,6 @@ Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component.Nie można utworzyć - - Debugger::DebuggerRunControl - - Debugger - Debugger - - - No executable specified. - Nie podano pliku wykonywalnego. - - - &Show this message again. - &Pokazuj ten komunikat ponownie. - - - Debugging starts - Rozpoczęto debugowanie - - - Debugging has failed - Błąd debugowania - - - Debugging has finished - Zakończono debugowanie - - - A debugging session is still in progress. Terminating the session in the current state can leave the target in an inconsistent state. Would you still like to terminate it? - Trwa sesja debugowa. Zakończenie jej w bieżącym stanie może spowodować, że program znajdzie się w niespójnym stanie. Czy zakończyć ją? - - - Close Debugging Session - Zakończ sesję debugową - - Debugger::Internal::DebuggerPane @@ -13755,8 +13721,8 @@ Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component. Debugger::Internal::LogWindow - Debugger Log - Log debuggera + Debugger &Log + &Log debuggera Repeat last command for debug reasons. @@ -13767,12 +13733,13 @@ Qt > Tools > Qt Creator > Qt Creator CDB Debugger Support component.Komenda: - NOTE: This log contains possibly confidential information about your machine, environment variables, in-memory data of the processes you are debugging, and more. It is never transferred over the internet by Qt Creator, and only stored to disk if you manually use the respective option from the context menu, or through mechanisms that are not under Qt Creator's control, for instance in swap files. + Note: This log contains possibly confidential information about your machine, environment variables, in-memory data of the processes you are debugging, and more. It is never transferred over the internet by Qt Creator, and only stored to disk if you manually use the respective option from the context menu, or through mechanisms that are not under Qt Creator's control, for instance in swap files. You may be asked to share the contents of this log when reporting bugs related to debugger operation. In this case, make sure your submission does not contain data you do not want to or you are not allowed to share. Uwaga: Poniższy log może zawierać poufne informacje o Twojej maszynie, o zmiennych środowiskowych, o danych w pamięci debugowanych procesów lub o jeszcze innych danych. Qt Creator nigdy nie przesyła loga przez internet, jest on jedynie zachowywany na dysku, jeśli włączona jest odpowiednia opcja podręcznego menu lub jeśli spowodowały to inne mechanizmy, które są poza kontrolą Qt Creatora, jak na przykład tworzenie plików swap. Możesz zostać poproszony o podzielenie się zawartością tego loga podczas tworzenia raportu o błędzie w debuggerze. W tym przypadku upewnij się, że raport nie zawiera informacji którymi nie chcesz lub nie możesz się dzielić. + @@ -15627,13 +15594,6 @@ do systemu kontroli wersji (%2) Zwiń wszystko - - CppEditor::Internal::CppSnippetProvider - - C++ - C++ - - Debugger::Internal::StartRemoteCdbDialog @@ -15729,6 +15689,30 @@ do systemu kontroli wersji (%2) Debugger Runtime Program debuggera + + &Breakpoints + &Pułapki + + + &Modules + &Moduły + + + Reg&isters + &Rejestry + + + &Stack + &Stos + + + &Threads + &Wątki + + + Locals and &Expressions + Zmienne &lokalne i wyrażenia + Debugger Debugger @@ -15931,10 +15915,6 @@ Qt Creator nie może się do niego podłączyć. Start "%1" and break at function "main()" Rozpocznij "%1" i zatrzymaj w funkcji "main()" - - Breakpoints - Pułapki - Select a valid expression to evaluate. do przetworzenia? @@ -15948,30 +15928,10 @@ Qt Creator nie może się do niego podłączyć. Memory... Pamięć... - - Modules - Moduły - - - Registers - Rejestry - - - Stack - Stos - Source Files Pliki źródłowe - - Threads - Wątki - - - Locals and Expressions - Zmienne lokalne i wyrażenia - Snapshots Zrzuty @@ -16140,13 +16100,6 @@ Qt Creator nie może się do niego podłączyć. Źródła Qt - - DebuggerEngine - - Debugging complex command lines is currently not supported on Windows. - Debugowanie złożonych linii komend nie jest obecnie obsługiwane pod systemem Windows. - - Debugger::Internal::MemoryAgent @@ -16164,10 +16117,6 @@ Qt Creator nie może się do niego podłączyć. Debugger::Internal::QmlCppEngine - - The slave debugging engine required for combined QML/C++-Debugging could not be created: %1 - Nie można utworzyć wymaganego podrzędnego silnika debugującego dla wspólnego debugowania QML/C++: %1 - C++ debugger activated Uaktywniono debugger C++ @@ -16201,22 +16150,10 @@ Ponowić próbę? Could not connect to the in-process QML debugger. %1 Nie można podłączyć się do wewnątrzprocesowego debuggera QML. %1 - - QML debugging port not set: Unable to convert %1 to unsigned int. - Nie ustawiono portu debugowego QML: nie można skonwertować %1 do "unsigned int". - Starting %1 %2 Uruchamianie %1 %2 - - Failed to start application - Nie można uruchomić aplikacji - - - Application startup failed: %1 - Błąd uruchamiania aplikacji: %1 - Waiting for JavaScript engine to interrupt on next statement. Oczekiwanie na przerwanie wykonywania następnej instrukcji przez silnik JavaScript. @@ -16527,13 +16464,6 @@ Ponowić próbę? Zwiń wszystko - - QmlJSEditor::Internal::QmlJSSnippetProvider - - QML - QML - - QmlJSTools::Internal::FunctionFilter @@ -16583,13 +16513,6 @@ Ponowić próbę? Ten kreator generuje projekt z podkatalogami Qt. Podprojekty mogą być dodane później przy użyciu innych kreatorów. - - TextEditor::Internal::PlainTextSnippetProvider - - Text - Tekst - - TextEditor::Internal::SnippetsTableModel @@ -16944,7 +16867,7 @@ if (a && A remote with the name "%1" already exists. - + Istnieje już zdalne repozytorium o nazwie "%1". The URL may not be valid. @@ -17012,6 +16935,10 @@ if (a && Start QML Profiler Uruchom profiler QML + + Select an externally started QML-debug enabled application.<p>Commonly used command-line arguments are: + + Kit: Zestaw narzędzi: @@ -17623,6 +17550,10 @@ With cache simulation, further event counters are enabled: File Error Błąd pliku + + Cannot write file %1: %2 + Nie można zapisać pliku %1: %2 + Cannot write file %1. Disk full? Nie można zapisać pliku %1. Pełny dysk? @@ -17697,10 +17628,6 @@ With cache simulation, further event counters are enabled: Callgrind unpaused. Callgrind wznowił pracę. - - Downloading remote profile data... - Pobieranie zdalnych danych profilera... - Valgrind::Callgrind::DataModel @@ -17847,13 +17774,6 @@ With cache simulation, further event counters are enabled: Pozycja: - - Valgrind::Callgrind::CallgrindRunner - - Parsing Profile Data... - Parsowanie danych profilera... - - Core::InfoBarDisplay @@ -18075,17 +17995,13 @@ With cache simulation, further event counters are enabled: Hide or show event categories. Pokazuje lub ukrywa kategorie zdarzeń. - - QML Profiler (External) - Profiler QML (zewnętrzny) - A QML Profiler analysis is still in progress. Nadal trwa analiza profilera QML. Start QML Profiler analysis. - Uruchom analizę profiler QML. + Uruchom analizę profilera QML. Qt Creator @@ -18101,6 +18017,10 @@ Spróbować ponownie? Failed to connect. Nie można uzyskać połączenia. + + QML Profiler (Attach to Waiting Application) + Profilowanie QML (Dołącz do oczekującej aplikacji) + Disable Profiling Zablokuj profilowanie @@ -18190,13 +18110,13 @@ Do you want to save the data first? Profile The name of the profile build configuration created by default for a qmake project. - Profil + Profilowanie Profile Shadow build directory suffix Non-ASCII characters in directory suffix may cause build issues. - Profil + Profile Release @@ -18553,7 +18473,7 @@ Kiedy zostaje wykryty problem, aplikacja jest zatrzymywana i może zostać zdebu CheckBox - CheckBox + Przycisk wyboru Add Branch @@ -18753,21 +18673,6 @@ Dodatkowo, przetestowane zostanie połączenie z urządzeniem. Nie ustawiono zdalnej ścieżki - - RemoteLinux::Internal::RemoteLinuxRunControlFactory - - Cannot debug: Kit has no device. - Nie można debugować: brak urządzenia w zestawie narzędzi. - - - Cannot debug: Not enough free ports available. - Nie można debugować: brak wolnych portów. - - - Cannot debug: Local executable is not set. - Nie można debugować: brak ustawionego lokalnego pliku wykonywalnego. - - RemoteLinux::CreateTarStepWidget @@ -20082,7 +19987,7 @@ p, li { white-space: pre-wrap; } Days - Dni + Dni @@ -20109,7 +20014,7 @@ p, li { white-space: pre-wrap; } Days - Dni + Dni @@ -20557,6 +20462,10 @@ Przedrostki te, w dodatku do nazwy bieżącego pliku, używane są do przełącz &Check host key &Sprawdź klucz hosta + + Key via ssh-agent + Poprzez ssh-agenta + RemoteLinux::Internal::GenericLinuxDeviceConfigurationWizardSetupPage @@ -20596,6 +20505,10 @@ Przedrostki te, w dodatku do nazwy bieżącego pliku, używane są do przełącz The username to log into the device: Nazwa użytkownika na urządzeniu: + + Agent + Agent + RemoteLinuxCheckForFreeDiskSpaceStepWidget @@ -20926,6 +20839,26 @@ Ustala, jak klawisz "Backspace" reaguje na wcięcia. Highlight search results on the scrollbar Podświetlaj rezultaty wyszukiwań na pasku przewijania + + Animate navigation within file + + + + Annotations next to lines + Adnotacje do linii + + + Next to editor content + Obok zawartości edytora + + + Next to right margin + Obok prawego marginesu + + + Aligned at right side + Wyrównane do prawej strony + TextEditor::Internal::HighlighterSettingsPage @@ -21424,10 +21357,18 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS. Unexpected packet of type %1. Nieoczekiwany pakiet typu %1. + + ssh-agent has no keys. + ssh-agent nie zawiera kluczy. + Password expired. Hasło straciło ważność. + + The server rejected all keys known to the ssh-agent. + Serwer odrzucił wszystkie klucze zawarte w ssh-agencie. + Server rejected password. Serwer odrzucił hasło. @@ -21436,6 +21377,14 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS. Server rejected key. Serwer odrzucił klucz. + + Server sent unexpected SSH_MSG_USERAUTH_PK_OK packet. + Serwer wysłał nieoczekiwany pakiet SSH_MSG_USERAUTH_PK_OK. + + + Server sent unexpected key in SSH_MSG_USERAUTH_PK_OK packet. + Serwer wysłał nieoczekiwany klucz w pakiecie SSH_MSG_USERAUTH_PK_OK. + The server sent an unexpected SSH packet of type SSH_MSG_UNIMPLEMENTED. Serwer wysłał nieoczekiwany pakiet SSH typu SSH_MSG_UNIMPLEMENTED. @@ -21448,6 +21397,10 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS. Connection closed unexpectedly. Nieoczekiwane zamknięcie połączenia. + + Timeout waiting for keys from ssh-agent. + Przekroczono limit czasu oczekiwania na klucze od ssh-agenta. + Timeout waiting for reply from server. Przekroczono limit czasu oczekiwania na odpowiedź od serwera. @@ -21593,11 +21546,11 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS. Keystore Filename - + Nazwa pliku z magazynem kluczy Keystore files (*.keystore *.jks) - + Pliki z magazynami kluczy (*.keystore *.jks) Error @@ -21648,13 +21601,6 @@ Sprawdź dokumentację SSH i zmienną środowiskową SSH_ASKPASS. Android - - Android::Internal::AndroidRunControl - - Starting remote process. - Uruchamianie zdalnego procesu. - - Android::Internal::AndroidRunner @@ -21751,7 +21697,7 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt. The GDB inside this NDK seems to not support Python. The Qt Project offers fixed GDB builds at: <a href="http://download.qt.io/official_releases/gdb/">http://download.qt.io/official_releases/gdb/</a> - + GDB wewnątrz tego NDK nie obsługuje Pythona. Qt Project oferuje poprawione wersje GDB tutaj: <a href="http://download.qt.io/official_releases/gdb/">http://download.qt.io/official_releases/gdb/</a> AVD Manager Not Available @@ -22235,6 +22181,10 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.Error Błąd + + Upload failed: %1 + Błąd wysyłania: %1 + No symbol file given. Brak pliku z symbolami. @@ -22311,8 +22261,8 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.Nie można odnaleźć ABI dla zdalnego procesu "%1". - Remote: "%1:%2" - Zdalny: "%1 %2" + Remote: "%1" + Zdalny: "%1" Process gdbserver finished. Status: %1 @@ -22436,7 +22386,7 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt. typechange - + zmiana typu by both @@ -22485,10 +22435,6 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.Cherry &Pick - - Fallback - - Fetching "%1"... Pobieranie "%1"... @@ -22502,7 +22448,13 @@ Wersje Qt można dodać w: Opcje > Budowanie i uruchamianie > Wersje Qt.Zdalny: - Refresh Remote Servers + Certificate Error + Błąd certyfikatu + + + Server certificate for %1 cannot be authenticated. +Do you want to disable SSL verification for this server? +Note: This can expose you to man-in-the-middle attack. @@ -22631,7 +22583,7 @@ Czy zakończyć proces? cur&l: - + cur&l: SSH &Port: @@ -22866,10 +22818,6 @@ were not verified among remotes in %3. Select different folder? Connection error: %1 Błąd połączenia: %1 - - Could not start remote process: %1 - Nie można uruchomić zdalnego procesu %1 - Remote process crashed: %1 Zdalny proces przerwał pracę: %1 @@ -22986,27 +22934,33 @@ were not verified among remotes in %3. Select different folder? New Session Name Nazwa nowej sesji - - - ProjectExplorer::Internal::WinCEToolChainFactory - WinCE - WinCE - - - - ProjectExplorer::Internal::WinCEToolChainConfigWidget - - SDK: - SDK: + &Create + &Utwórz - WinCE Version: - Wersja WinCE: + Create and &Open + Utwórz i &otwórz - ABI: - ABI: + &Clone + S&klonuj + + + Clone and &Open + Sklonuj i &otwórz + + + Rename Session + Zmień nazwę sesji + + + &Rename + Z&mień nazwę + + + Rename and &Open + Zmień nazwę i &otwórz @@ -23150,18 +23104,6 @@ poinstruuje Qt Creatora o URI. Preparing remote side... Przygotowywanie zdalnej strony... - - The %1 process closed unexpectedly. - Proces %1 nieoczekiwanie zakończył pracę. - - - Initial setup failed: %1 - Błąd wstępnej konfiguracji: %1 - - - Warning: "slog2info" is not found on the device, debug output not available. - Ostrzeżenie: brak"slog2info" na urządzeniu, komunikaty debugowe nie będą dostępne. - Qnx::Internal::QnxDeployConfigurationFactory @@ -23317,24 +23259,8 @@ poinstruuje Qt Creatora o URI. RemoteLinux::LinuxDeviceDebugSupport - Checking available ports... - Sprawdzanie dostępnych portów... - - - Not enough free ports on device for C++ debugging. - Niewystarczająca ilość wolnych portów w urządzeniu do debugowania C++. - - - Not enough free ports on device for QML debugging. - Niewystarczająca ilość wolnych portów w urządzeniu do debugowania QML. - - - Debugging failed. - Błąd debugowania. - - - Initial setup failed: %1 - Błąd wstępnej konfiguracji: %1 + Cannot debug: Local executable is not set. + Nie można debugować: brak ustawionego lokalnego pliku wykonywalnego. @@ -23600,7 +23526,7 @@ poinstruuje Qt Creatora o URI. &Graphical (single file only) - + &Graficzne (tylko dla pojedynczego pliku) Do &not prompt for comment during checkout or check-in @@ -23628,22 +23554,10 @@ poinstruuje Qt Creatora o URI. Confirm Version to Check Out Potwierdź wersję dla kopii roboczej - - There are multiple versions of '%1' which can be considered for checkout. Please select version to checkout: - Istnieje wiele wersji "%1" które mogą być użyte dla kopii roboczej. Wybierz wersję: - - - &Loaded Version - &Załadowana wersja - Version after &update Wersja po akt&ualizacji - - <html><head/><body><p><b>NOTE: You will not be able to check in this file without merging the changes (not supported by the plugin)</b></p></body></html> - <html><head/><body><p><b>UWAGA: Nie będzie można wrzucić tego pliku do repozytorium bez scalenia zmian (nieobsługiwane przez wtyczkę)</b></p></body></html> - Created by: Utworzona przez: @@ -23653,6 +23567,18 @@ poinstruuje Qt Creatora o URI. Date Utworzona dnia: + + Multiple versions of "%1" can be checked out. Select the version to check out: + Istnieje wiele wersji "%1" które mogą być użyte dla kopii roboczej. Wybierz wersję: + + + &Loaded version + &Załadowana wersja + + + <html><head/><body><p><b>Note: You will not be able to check in this file without merging the changes (not supported by the plugin)</b></p></body></html> + <html><head/><body><p><b>Uwaga: Nie będzie można wrzucić tego pliku do repozytorium bez scalenia zmian (nieobsługiwane przez wtyczkę)</b></p></body></html> + Android::Internal::AndroidToolChainConfigWidget @@ -24014,6 +23940,15 @@ poinstruuje Qt Creatora o URI. Start Debugger Uruchom debugger + + Override server channel: + Nadpisz kanał serwera: + + + For example, %1 + "For example, /dev/ttyS0, COM1, 127.0.0.1:1234" + Na przykład: %1 + Select Executable Wybierz plik wykonywalny @@ -24022,10 +23957,6 @@ poinstruuje Qt Creatora o URI. Server port: Port serwera: - - Override server address - Nadpisz adres serwera - Select Working Directory Wybierz katalog roboczy @@ -24078,6 +24009,11 @@ poinstruuje Qt Creatora o URI. Debug &information: &Informacja debugowa: + + Normally, the running server is identified by the IP of the device in the kit and the server port selected above. +You can choose another communication channel here, such as a serial line or custom ip:port. + + &Recent: &Ostatni: @@ -24158,7 +24094,7 @@ poinstruuje Qt Creatora o URI. Type of Debugger Backend - + Typ back-endu debuggera Unknown debugger version @@ -24354,6 +24290,10 @@ poinstruuje Qt Creatora o URI. Private key file Plik z kluczem prywatnym + + Device name + Nazwa urządzenia + ProjectExplorer::KitManager @@ -24386,7 +24326,7 @@ poinstruuje Qt Creatora o URI. Reset to Device Default Icon - + Przywróć domyślną ikonę urządzenia Display name is not unique. @@ -24692,11 +24632,11 @@ poinstruuje Qt Creatora o URI. Create Branch Stash for "%1" - + Utwórz gałąź z odłożoną zmianą dla gałęzi "%1" Create Branch Stash for Current Branch - + Utwórz gałąź z odłożoną zmianą dla bieżącej gałęzi @@ -25834,10 +25774,6 @@ Więcej informacji w dokumentacji "Checking Code Syntax". Bookmarks::Internal::BookmarkManager - - Bookmark - Zakładka - Edit Bookmark Zmodyfikuj zakładkę @@ -25883,6 +25819,11 @@ Więcej informacji w dokumentacji "Checking Code Syntax".Additional Preprocessor Directives... Dodatkowe dyrektywy preprocesora... + + C++ + SnippetProvider + C++ + Switch Between Function Declaration/Definition Przełącz między deklaracją a definicją funkcji @@ -26182,10 +26123,6 @@ Więcej informacji w dokumentacji "Checking Code Syntax".An unknown error in the LLDB process occurred. Wystąpił nieznany błąd w procesie LLDB. - - Adapter start failed - Nie można uruchomić adaptera - Debugger Error Błąd debuggera @@ -26439,7 +26376,7 @@ Zdalny: %4 Each line adds a global header lookup path. - + Każda linia dodaje globalną ścieżkę poszukiwania plików nagłówkowych. Comma-separated list of flags that turn on C++11 support. @@ -26595,6 +26532,10 @@ Zdalny: %4 Build directory: Katalog wersji: + + Configuration name: + Nazwa konfiguracji: + QbsProjectManager::Internal::QbsBuildStep @@ -26642,8 +26583,16 @@ Zdalny: %4 Nie można zapisać pliku projektu %1. - Cannot build: Selected products do not exist anymore. - Nie można zbudować: wybrane produkty docelowe już nie istnieją. + %1: Selected products do not exist anymore. + %1: wybrane produkty już nie istnieją. + + + Cannot clean + Nie można wyczyścić + + + Cannot build + Nie można zbudować Reading Project "%1" @@ -26684,6 +26633,30 @@ Zdalny: %4 Ctrl+Alt+Shift+B Ctrl+Alt+Shift+B + + Clean + Wyczyść + + + Clean Product + Wyczyść produkt + + + Clean Product "%1" + Wyczyść produkt "%1" + + + Rebuild + Przebuduj + + + Rebuild Product + Przebuduj produkt + + + Rebuild Product "%1" + Przebuduj produkt "%1" + Build Subproject Zbuduj podprojekt @@ -26696,6 +26669,22 @@ Zdalny: %4 Ctrl+Shift+B Ctrl+Shift+B + + Clean Subproject + Wyczyść podprojekt + + + Clean Subproject "%1" + Wyczyść podprojekt "%1" + + + Rebuild Subproject + Przebuduj podprojekt + + + Rebuild Subproject "%1" + Przebuduj podprojekt "%1" + QbsProjectManager::Internal::QbsRunConfiguration @@ -27002,12 +26991,12 @@ Zdalny: %4 QmlDesigner::Internal::MetaInfoReader - Illegal state while parsing - Niepoprawny stan podczas parsowania + Illegal state while parsing. + Niepoprawny stan podczas parsowania. - No property definition allowed - Definicja właściwości nie jest dozwolona + No property definition allowed. + Definicja właściwości nie jest dozwolona. Invalid type %1 @@ -27137,10 +27126,6 @@ Zdalny: %4 Toggle &Right Sidebar Przełącz p&rawy boczny pasek - - &Go into Component - &Przejdź do komponentu - Switch Text/Design Przełącz tekst / projekt @@ -27181,32 +27166,6 @@ Zdalny: %4 Środowisko zestawu narzędzi - - Qnx::Internal::QnxAbstractRunSupport - - Not enough free ports on device for debugging. - Niewystarczająca ilość wolnych portów w urządzeniu do debugowania. - - - - Qnx::Internal::QnxAnalyzeSupport - - Preparing remote side... - Przygotowywanie zdalnej strony... - - - The %1 process closed unexpectedly. - Proces %1 nieoczekiwanie zakończył pracę. - - - Initial setup failed: %1 - Błąd wstępnej konfiguracji: %1 - - - Warning: "slog2info" is not found on the device, debug output not available. - Ostrzeżenie: brak"slog2info" na urządzeniu, komunikaty debugowe nie będą dostępne. - - Qnx::Internal::QnxDeviceTester @@ -27248,33 +27207,6 @@ Zdalny: %4 Brak fabryki dla qmake: "%1" - - RemoteLinux::RemoteLinuxAnalyzeSupport - - Checking available ports... - Sprawdzanie dostępnych portów... - - - Creating remote socket... - Tworzenie zdalnych gniazd... - - - Not enough free ports on device for profiling. - Niewystarczająca ilość wolnych portów w urządzeniu do profilowania. - - - FIFO for profiling data could not be created. - Nie można utworzyć kolejki dla danych profilowania. - - - Failure running remote process. - Błąd uruchamiania zdalnego procesu. - - - Initial setup failed: %1 - Błąd wstępnej konfiguracji: %1 - - RemoteLinux::RemoteLinuxEnvironmentAspect @@ -27782,11 +27714,11 @@ Zdalny: %4 Font capitalization - + Kapitaliki czcionki Sets the capitalization for the text. - + Ustawia kapitaliki dla tekstu. Font weight @@ -28271,25 +28203,6 @@ Czy odinstalować istniejący pakiet? %1 (na serwerze GDB lub debuggerze sprzętowym) - - BareMetal::Internal::BareMetalRunControlFactory - - Cannot debug: Local executable is not set. - Nie można debugować: brak ustawionego lokalnego pliku wykonywalnego. - - - Cannot debug: Could not find executable for "%1". - Nie można debugować: nie można odnaleźć pliku wykonywalnego dla "%1". - - - Cannot debug: Kit has no device. - Nie można debugować: brak urządzenia w zestawie narzędzi. - - - Cannot debug: Device has no GDB server provider configuration. - Nie można debugować: urządzenie nie posiada konfiguracji dostawcy serwera GDB. - - CppEditor::Internal::CppIncludeHierarchyFactory @@ -28404,12 +28317,16 @@ Czy odinstalować istniejący pakiet? Ios::Internal::IosConfigurations - %1 %2 - %1 %2 + %1 Simulator + Symulator %1 Ios::Internal::IosDebugSupport + + Application not running. + Aplikacja nie jest uruchomiona. + Could not find device specific debug symbols at %1. Debugging initialization will be slow until you open the Organizer window of Xcode with the device connected to have the symbols generated. @@ -28422,22 +28339,6 @@ Czy odinstalować istniejący pakiet? The dSYM %1 seems to be outdated, it might confuse the debugger. dSYM %1 może być nieaktualny i może spowodować nieprawidłową pracę debuggera. - - Could not get debug server file descriptor. - - - - Got an invalid process id. - Otrzymano niepoprawny identyfikator procesu. - - - Run ended with error. - Praca zakończona błędem. - - - Run ended. - Praca zakończona. - Ios::Internal::IosDeployConfiguration @@ -28613,27 +28514,24 @@ Czy odinstalować istniejący pakiet? Ustawienia uruchamiania iOS - - Ios::Internal::IosRunControl - - Starting remote process. - Uruchamianie zdalnego procesu. - - - Run ended with error. - Praca zakończona błędem. - - - Run ended. - Praca zakończona. - - Ios::Internal::IosRunner Could not find %1. Nie można odnaleźć %1. + + Could not get necessary ports for the debugger connection. + + + + Could not get inferior PID. + + + + Could not get necessary ports the debugger connection. + + Run failed. The settings in the Organizer window of Xcode might be incorrect. Nieudane uruchomienie. Ustawienia w oknie "Organizer" w Xcode mogą być niepoprawne. @@ -28642,6 +28540,14 @@ Czy odinstalować istniejący pakiet? The device is locked, please unlock. Urządzenie jest zablokowane, odblokuj je. + + Run ended. + Praca zakończona. + + + Run ended with error. + Praca zakończona błędem. + Ios::Internal::IosSettingsPage @@ -28667,35 +28573,35 @@ Czy odinstalować istniejący pakiet? Ios::IosToolHandler - iOS tool Error %1 + iOS tool error %1 Błąd narzędzia iOS %1 - Application install on Simulator failed. %1 - Instalacja aplikacji na symulatorze zakończona błędem. %1 - - - Application install on Simulator failed. Simulator not running. + Application install on simulator failed. Simulator not running. Instalacja aplikacji na symulatorze zakończona błędem. Symulator nie jest uruchomiony. - Application launch on Simulator failed. Invalid Bundle path %1 - Uruchomienie aplikacji na symulatorze zakończone błędem. Niepoprawna ścieżka %1 + Application launch on simulator failed. Invalid bundle path %1 + Uruchomienie aplikacji na symulatorze zakończone błędem. Niepoprawna ścieżka %1 dla bundle - Application launch on Simulator failed. Simulator not running. + Application launch on simulator failed. Simulator not running. Uruchomienie aplikacji na symulatorze zakończone błędem. Symulator nie jest uruchomiony. + + Application install on simulator failed. %1 + Instalacja aplikacji na symulatorze zakończona błędem. %1 + Cannot capture console output from %1. Error redirecting output to %2.* - + Nie można przechwycić komunikatów z konsoli %1. Błąd przekierowania wyjścia na %2.* Cannot capture console output from %1. Install Xcode 8 or later. - + Nie można przechwycić komunikatów z konsoli %1. Zainstaluj Xcode 8 lub nowszą wersję. - Application launch on Simulator failed. %1 + Application launch on simulator failed. %1 Uruchomienie aplikacji na symulatorze zakończone błędem. %1 @@ -29101,13 +29007,6 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani Niepoprawny główny element: %1 - - Qnx::Internal::QnxRunControl - - Warning: "slog2info" is not found on the device, debug output not available. - Ostrzeżenie: brak"slog2info" na urządzeniu, komunikaty debugowe nie będą dostępne. - - Qnx::Internal::QnxToolChainFactory @@ -29133,6 +29032,10 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani Qnx::Internal::Slog2InfoRunner + + Warning: "slog2info" is not found on the device, debug output not available. + Ostrzeżenie: brak"slog2info" na urządzeniu, komunikaty debugowe nie będą dostępne. + Cannot show slog2info output. Error: %1 Nie można pokazać komunikatów slog2info. Błąd: %1 @@ -29152,70 +29055,6 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani Uaktualnij - - Valgrind::Internal::CallgrindRunControl - - Profiling - Profilowanie - - - Profiling %1 - Profilowanie %1 - - - - Valgrind::Memcheck::MemcheckRunner - - XmlServer on %1: - XmlServer na %1: - - - LogServer on %1: - LogServer na %1: - - - - Valgrind::Internal::MemcheckRunControl - - Analyzing Memory - Analiza pamięci - - - Analyzing memory of %1 - Analiza pamięci w %1 - - - - Valgrind::Internal::ValgrindRunControl - - Valgrind options: %1 - Opcje valgrinda: %1 - - - Working directory: %1 - Katalog roboczy: %1 - - - Command line arguments: %1 - Argumenty linii komend: %1 - - - Analyzing finished. - Zakończono analizę. - - - Error: "%1" could not be started: %2 - Błąd: nie można uruchomić "%1": %2 - - - Error: no Valgrind executable set. - Błąd: nie ustawiono pliku wykonywalnego valgrind. - - - Process terminated. - Zakończono proces. - - Valgrind::Internal::ValgrindOptionsPage @@ -29223,13 +29062,6 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani Valgrind - - Valgrind::ValgrindProcess - - Could not determine remote PID. - Nie można określić zdalnego PID. - - Valgrind::Internal::ValgrindRunConfigurationAspect @@ -29312,6 +29144,10 @@ For example, "Revision: 15" will leave the branch at revision 15.Restrict to MIME types: Zastosuj jedynie do typów MIME: + + Use specific config file: + Używaj szczególnego pliku konfiguracyjnego: + Beautifier::Internal::ClangFormat::ClangFormatOptionsPage @@ -29343,10 +29179,6 @@ For example, "Revision: 15" will leave the branch at revision 15.Use customized style: Używaj własnego stylu: - - For action Format Selected Text - Dla akcji: "Sformatuj zaznaczony tekst" - Format entire file if no text was selected Sformatuj cały plik, jeśli nie zaznaczono w nim tekstu @@ -29355,6 +29187,14 @@ For example, "Revision: 15" will leave the branch at revision 15.Restrict to MIME types: Zastosuj jedynie do typów MIME: + + Fallback style: + Styl zastępczy: + + + For action Format Selected Text. + Dla akcji: "Sformatuj zaznaczony tekst". + Beautifier::Internal::ConfigurationDialog @@ -29738,6 +29578,10 @@ Zbuduj aplikację qmldump na stronie z opcjami wersji Qt. Beautifier Upiększacz + + Bea&utifier + U&piększacz + Beautifier::Internal::BeautifierPlugin @@ -29782,14 +29626,14 @@ Zbuduj aplikację qmldump na stronie z opcjami wersji Qt. Brak pliku z konfiguracją dla %1. - Format Current File + Format &Current File Menu entry - Sformatuj bieżący plik + Sformatuj &bieżący plik - Format Selected Text + Format &Selected Text Menu entry - Sformatuj zaznaczony tekst + Sformatuj &zaznaczony tekst %1 Command @@ -29824,8 +29668,25 @@ Zbuduj aplikację qmldump na stronie z opcjami wersji Qt. Model kodu clang - Global setting (%1) - Ustawienia globalne (%1) + Global + Globalne + + + Custom + Własne + + + General + Ogólne + + + Parse templates in a MSVC-compliant way. This helps to parse headers for example from Active Template Library (ATL) or Windows Runtime Library (WRL). +However, using the relaxed and extended rules means also that no highlighting/completion can be provided within template functions. + + + + Enable MSVC-compliant template parsing + @@ -30000,6 +29861,10 @@ Zbuduj aplikację qmldump na stronie z opcjami wersji Qt. Continue Kontynuuj + + Cannot replace because replacement text is unchanged. + Nie można zastąpić, ponieważ tekst zastępujący jest taki sam jak oryginał. + No matches found. Brak pasujących wyników. @@ -30145,12 +30010,8 @@ Czy przerwać ją? Ctrl+K - Type to locate - Wpisz aby znaleźć - - - Type to locate (%1) - Wpisz aby znaleźć (%1) + Locate... + Znajdź... <html><body style="color:#909090; font-size:14px"><div align='center'><div style="font-size:20px">Open a document</div><table><tr><td><hr/><div style="margin-top: 5px">&bull; File > Open File or Project (%1)</div><div style="margin-top: 5px">&bull; File > Recent Files</div><div style="margin-top: 5px">&bull; Tools > Locate (%2) and</div><div style="margin-left: 1em">- type to open file from any open project</div>%4%5<div style="margin-left: 1em">- type <code>%3&lt;space&gt;&lt;filename&gt;</code> to open file from file system</div><div style="margin-left: 1em">- select one of the other filters for jumping to a location</div><div style="margin-top: 5px">&bull; Drag and drop files here</div></td></tr></table></div></body></html> @@ -30183,17 +30044,17 @@ Czy przerwać ją? Odśwież - Locate... - Znajdź... + Type to locate + Wpisz aby znaleźć + + + Type to locate (%1) + Wpisz aby znaleźć (%1) Options Opcje - - <type here> - <wpisz tutaj> - Core::Internal::OpenDocumentsFilter @@ -30257,22 +30118,6 @@ Czy przerwać ją? Dołącz - - DiffEditor::DiffEditorController - - and %n more - Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" - - i jeszcze %n gałąź - i jeszcze %n gałęzie - i jeszcze %n gałęzi - - - - <None> - <Brak> - - ProjectExplorer::KitConfigWidget @@ -30319,12 +30164,8 @@ Czy przerwać ją? Brak wolnych portów do debugowania. - Remote: "%1:%2" - Process %3 - Zdalny host: "%1:%2" - proces %3 - - - Attaching failed. - Błąd dołączania. + Remote: "%1" - Process %2 + Zdalny host: "%1" - proces %2 @@ -30474,17 +30315,6 @@ Czy przerwać ją? Uruchom pakiet App - - WinRt::Internal::WinRtRunControlFactory - - Unsupported run mode %1. - Nieobsługiwany tryb uruchamiania %1. - - - WinRT Run Control Factory - - - WinRt::Internal::WinRtPackageDeploymentStepWidget @@ -30535,7 +30365,7 @@ Czy przerwać ją? Keystore: - + Magazyn kluczy: Create... @@ -31185,11 +31015,11 @@ The minimum API level required by the kit is %1. Cannot sign the package. Invalid keystore path(%1). - + Nie można podpisać pakietu. Nieprawidłowa ścieżka do magazynu kluczy (%1). Cannot sign the package. Certificate alias %1 does not exist. - + Nie można podpisać pakietu. Nie istnieje alias certyfikatu %1. Error @@ -31204,11 +31034,11 @@ The minimum API level required by the kit is %1. Android::AndroidBuildApkWidget Keystore files (*.keystore *.jks) - + Pliki z magazynami kluczy (*.keystore *.jks) Select Keystore File - + Wybierz plik z magazynem kluczy <b>Build Android APK</b> @@ -31401,7 +31231,7 @@ Zainstaluj SDK o wersji %1 lub wyższej. The project directory %1 contains files which cannot be overwritten: %2. - Katalog projektu %1 zawiera pliki, które nie moga być nadpisane: + Katalog projektu %1 zawiera pliki, które nie mogą być nadpisane: %2. @@ -31459,6 +31289,10 @@ Zainstaluj SDK o wersji %1 lub wyższej. Is Qt Creator running on any unix-based platform? Czy Qt Creator jest uruchomiony na platformie unixowej? + + The directory where Qt Creator finds its pre-installed resources. + Katalog, w którym Qt Creator znajduje swoje preinstalowane zasoby. + The current date (QDate formatstring). Bieżący dzień (QDate fromatstring). @@ -31909,6 +31743,22 @@ Do you want to check them out now? The debugging helpers are used to produce a nice display of objects of certain types like QString or std::map in the &quot;Locals and Expressions&quot; view. Programy pomocnicze debuggera pomagają lepiej wizualizować obiekty pewnych typów, jak np. QString lib std::map w widoku &quot;Zmienne lokalne i wyrażenia&quot;. + + Debugging Helper Customization + Konfiguracja programów pomocniczych debuggera + + + <html><head/><body><p>Python commands entered here will be executed after Qt Creator's debugging helpers have been loaded and fully initialized. You can load additional debugging helpers or modify existing ones here.</p></body></html> + <html><head/><body><p>Wprowadzone tutaj komendy Pythona zostaną wykonane zaraz po załadowaniu i zainicjalizowaniu programów pomocniczych debuggera Qt Creatora. Można tutaj załadować dodatkowych asystentów lub zmodyfikować istniejących.</p></body></html> + + + Extra Debugging Helpers + Dodatkowe programy pomocnicze debuggera + + + Path to a Python file containing additional data dumpers. + Ścieżka do pliku Pythona zawierającego dodatkowe skrypty generujące zrzuty danych. + <unlimited> <nieograniczona> @@ -31993,24 +31843,68 @@ Do you want to check them out now? Category under which Analyzer tasks are listed in Issues view Debugger + + Cannot start %1 without a project. Please open the project and try again. + Nie można uruchomić %1 bez projektu. Otwórz projekt i spróbuj ponownie. + + + Profile + Profilowanie + + + Release + Release + + + in Debug mode + w trybie Debug + + + in Profile mode + w trybie Profilowania + + + in Release mode + w trybie Release + + + with debug symbols (Debug or Profile mode) + z symbolami debugowymi (tryb Debug lub Profilowania) + + + on optimized code (Profile or Release mode) + z kodem zoptymalizowanym (tryb Profilowania lub Release) + + + Run %1 in %2 Mode? + Uruchomić %1 w trybie %2? + + + <html><head/><body><p>You are trying to run the tool "%1" on an application in %2 mode. The tool is designed to be used %3.</p><p>Run-time characteristics differ significantly between optimized and non-optimized binaries. Analytical findings for one mode may or may not be relevant for the other.</p><p>Running tools that need debug symbols on binaries that don't provide any may lead to missing function names or otherwise insufficient output.</p><p>Do you want to continue and run the tool in %2 mode?</p></body></html> + + Some breakpoints cannot be handled by the debugger languages currently active, and will be ignored. Affected are breakpoints %1 Niektóre pułapki nie mogą być obsłużone przez aktywne języki debuggera i zostaną zignorowane. Dotyczy to następujących pułapek: %1 + + The debugging engine required for combined QML/C++ debugging could not be created: %1 + Nie można utworzyć silnika debugującego kombinację języków QML/C++: %1 + + + Unable to create a debugging engine of the type "%1" + Nie można utworzyć silnika debugującego typu "%1" + Not enough free ports for QML debugging. - Niewystarczająca ilość wolnych portów do debugowania QML. + Niewystarczająca ilość wolnych portów do debugowania QML. Unknown debugger type "%1" Nieznany typ debuggera "%1" - - Unable to create a debugger engine of the type "%1" - Nie można utworzyć silnika debuggera typu "%1" - Install &Debug Information Zainstaluj informacje &debugowe @@ -32249,8 +32143,8 @@ Dotyczy to następujących pułapek: %1 Nie można otworzyć edytora dla "%1". - When parsing fields of page '%1': %2 - W trakcie parsowania pól strony "%1": %2 + When parsing fields of page "%1": %2 + W trakcie parsowania pól strony "%1": %2 "data" for a "File" page needs to be unset or an empty object. @@ -32843,7 +32737,7 @@ Używa desktopowego Qt do budowania aplikacji, jeśli jest on dostępny. Creates an empty Nim file using UTF-8 charset. - + Tworzy pusty plik Nim, który używa kodowania UTF-8. Nim @@ -33688,17 +33582,6 @@ Use this only if you are prototyping. You cannot create a full application with Przeładuj - - Ios::Internal::IosAnalyzeSupport - - Run ended with error. - Praca zakończona błędem. - - - Run ended. - Praca zakończona. - - Mercurial::Internal::MercurialEditorWidget @@ -33820,11 +33703,11 @@ Use this only if you are prototyping. You cannot create a full application with CheckBox data is not an object. - Dane CheckBox nie są obiektem. + Dane przycisku wyboru nie są obiektem. CheckBox values for checked and unchecked state are identical. - Jednakowe wartości CheckBox dla stanów: zaznaczony i niezaznaczony. + Jednakowe wartości przycisku wyboru dla stanów: zaznaczony i niezaznaczony. No lists allowed inside ComboBox items list. @@ -33911,7 +33794,8 @@ do projektu "%2". Path "%1" does not exist when checking Json wizard search paths. - + Ścieżka "%1" nie istnieje podczas sprawdzania ścieżek poszukiwań kreatora Json. + Checking "%1" for %2. @@ -34318,6 +34202,10 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Found old folder "android" in source directory. Qt 5.2 does not use that folder by default. Odnaleziono folder "android" w katalogu źródłowym. Qt 5.2 domyślnie nie używa tego katalogu. + + Android build SDK not defined. Check Android settings. + + No application .pro file found, not building an APK. Brak pliku .pro aplikacji, budowanie APK wstrzymane. @@ -34417,21 +34305,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Refaktoryzacja - - QmlJSEditor::Internal::QmlJSHoverHandler - - Library at %1 - Biblioteka w %1 - - - Dumped plugins successfully. - Wtyczki poprawnie zrzucone. - - - Read typeinfo files successfully. - Pliki typeinfo poprawnie odczytane. - - Qnx::Internal::QnxConfiguration @@ -34724,14 +34597,18 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan &Collapse All &Zwiń wszystko - - &Edit... - &Modyfikuj... - Store profiles in Qt Creator settings directory Przechowuj profile w katalogu z ustawieniami Qt Creatora + + Qbs version: + Wersja Qbs: + + + TextLabel + Etykietka + Todo::Internal::TodoProjectSettingsWidget @@ -34780,11 +34657,11 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Fill width - + Wypełnij szerokość Fill height - + Wypełnij wysokość Preferred size @@ -34897,16 +34774,16 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan BareMetal::Internal::BareMetalDebugSupport - Debugging failed. - Błąd debugowania. + Cannot debug: Kit has no device. + Nie można debugować: brak urządzenia w zestawie narzędzi. - Initial setup failed: %1 - Błąd wstępnej konfiguracji: %1 + Cannot debug: Local executable is not set. + Nie można debugować: brak ustawionego lokalnego pliku wykonywalnego. - Starting GDB server... - Uruchamianie serwera GDB... + Cannot debug: Could not find executable for "%1". + Nie można debugować: nie można odnaleźć pliku wykonywalnego dla "%1". @@ -34950,7 +34827,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Choose the desired startup mode of the GDB server provider. - + Wybierz tryb startowy dostarczyciela serwera GDB. Startup mode: @@ -35380,10 +35257,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Debugger::Internal::DebuggerEnginePrivate - - Debugged executable - Debugowany program - Attempting to interrupt. Próba przerwania. @@ -35439,6 +35312,14 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Unexpected %1 Exit Nieoczekiwane zakończenie %1 + + Adapter start failed + Nie można uruchomić adaptera + + + Debugging complex command lines is currently not supported on Windows. + Debugowanie złożonych linii komend nie jest obecnie obsługiwane w systemie Windows. + Taking notice of pid %1 Zwracanie uwagi na pid %1 @@ -35495,7 +35376,13 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan The inferior is in the Portable Executable format. -Selecting CDB as debugger would improve the debugging experience for this binary format. +Selecting %1 as debugger would improve the debugging experience for this binary format. + + + + The selected debugger may be inappropriate for the inferior. +Examining symbols and setting breakpoints by file name and line number may fail. + @@ -35519,12 +35406,6 @@ Selecting GDB or LLDB as debugger would improve the debugging experience for thi Warning Ostrzeżenie - - The selected debugger may be inappropiate for the inferior. -Examining symbols and setting breakpoints by file name and line number may fail. - - - This does not seem to be a "Debug" build. Setting breakpoints by file name and line number may fail. @@ -35697,8 +35578,8 @@ Ustawianie pułapek w liniach plików może się nie udać. Oczekiwanie na dane... - Failed - Niepoprawnie zakończone + Retrieving data failed. + Błąd pobierania danych. @@ -35719,8 +35600,8 @@ Ustawianie pułapek w liniach plików może się nie udać. Oczekiwanie na dane... - Failed - Niepoprawnie zakończone + Retrieving data failed. + Błąd pobierania danych. @@ -35742,8 +35623,8 @@ Ustawianie pułapek w liniach plików może się nie udać. Pominięto nieznaną ilość linii... - No difference - Brak różnic + No difference. + Brak różnic. @@ -35783,7 +35664,7 @@ Ustawianie pułapek w liniach plików może się nie udać. ProjectExplorer::JsonKitsPage Feature list is set and not of type list. - + Ustawiono listę funkcjonalności, lecz wartość nie jest typu listy. No "%1" key found in feature list object. @@ -35889,14 +35770,6 @@ Ustawianie pułapek w liniach plików może się nie udać. Qbs Qbs - - Profiles - Profile - - - Version Info - Informacje o wersji - QbsRootProjectNode @@ -35939,20 +35812,6 @@ Ustawianie pułapek w liniach plików może się nie udać. Kontekst - - QmlProfiler::QmlProfilerRunControl - - Qt Creator - Qt Creator - - - Could not connect to the in-process QML debugger: -%1 - %1 is detailed error message - Nie można podłączyć się do wewnątrzprocesowego debuggera QML: -%1 - - QmlProfiler::Internal::QmlProfilerRangeModel @@ -36016,21 +35875,29 @@ Ustawianie pułapek w liniach plików może się nie udać. Delete &Line Usuń &linię + + Delete Line from Cursor On + Usuń od kursora do końca linii + Delete Word from Cursor On - Usuń słowo począwszy od kursora + Usuń od kursora do końca słowa Delete Word Camel Case from Cursor On - + Usuń od kursora do końca zbitki Camel Case + + + Delete Line up to Cursor + Usuń od początku linii do kursora Delete Word up to Cursor - Usuń słowo kończąc na kursorze + Usuń od początku słowa do kursora Delete Word Camel Case up to Cursor - + Usuń od początku zbitki Camel Case do kursora Go to Block Start with Selection @@ -36406,15 +36273,15 @@ Ustawianie pułapek w liniach plików może się nie udać. Go to Previous Word Camel Case - Przejdź do poprzedniego słowa w zbitce Camel Case + Przejdź do poprzedniej zbitki Camel Case Go to Next Word Camel Case - Przejdź do następnego słowa w zbitce Camel Case + Przejdź do następnej zbitki Camel Case Go to Line Start with Selection - Zaznacz do początku linii + Zaznacz od początku linii Go to Line End with Selection @@ -36426,11 +36293,11 @@ Ustawianie pułapek w liniach plików może się nie udać. Go to Previous Line with Selection - Zaznacz do poprzedniej linii + Zaznacz od poprzedniej linii Go to Previous Character with Selection - Zaznacz do poprzedniego znaku + Zaznacz od poprzedniego znaku Go to Next Character with Selection @@ -36438,7 +36305,7 @@ Ustawianie pułapek w liniach plików może się nie udać. Go to Previous Word with Selection - Zaznacz do poprzedniego słowa + Zaznacz od poprzedniego słowa Go to Next Word with Selection @@ -36446,11 +36313,11 @@ Ustawianie pułapek w liniach plików może się nie udać. Go to Previous Word Camel Case with Selection - Zaznacz do poprzedniego słowa w zbitce Camel Case + Zaznacz od poprzedniej zbitki Camel Case Go to Next Word Camel Case with Selection - Zaznacz do następnego słowa w zbitce Camel Case + Zaznacz do następnej zbitki Camel Case @@ -36781,15 +36648,15 @@ Ustawianie pułapek w liniach plików może się nie udać. QmlProfiler::Internal::QmlProfilerConfigWidget Flush data while profiling: - + Przepychaj dane podczas profilowania: Flush interval (ms): - + Częstość przepychania (ms): Process data only when process ends: - + Przetwarzaj dane tylko po zakończeniu procesu: Only process data when the process being profiled ends, not when the current recording @@ -37754,7 +37621,7 @@ Te pliki są zabezpieczone. Backends Title of dynamic properties view - + Back-endy Add binding or connection. @@ -37836,7 +37703,7 @@ Te pliki są zabezpieczone. Source Tool - + Narzędzie źródłowe @@ -38073,17 +37940,6 @@ Te pliki są zabezpieczone. %1 (Kopia) - - QbsProjectManager::Internal::QbsInfoWidget - - Form - Formularz - - - Qbs version: - Wersja Qbs: - - AddSignalHandlerDialog @@ -38397,6 +38253,11 @@ Te pliki są zabezpieczone. Filter Test Results Przefiltruj wyniki testu + + Switch Between Visual and Text Display + Text is usually visual too, isn't it? + + Test Results Wyniki testu @@ -38667,64 +38528,6 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Funkcja "%1" - - ClangStaticAnalyzer::Internal::ClangStaticAnalyzerRunControl - - Clang Static Analyzer - Statyczny analizator Clang - - - Running Clang Static Analyzer on %1 - Uruchamianie statycznego analizatora Clang na %1 - - - Clang Static Analyzer: Invalid executable "%1", stop. - Statyczny analizator Clang: niepoprawny plik wykonywalny "%1", zakończono pracę. - - - Clang Static Analyzer: Running with possibly unsupported version, could not determine version from executable "%1". - Statyczny analizator Clang: uruchomienie z użyciem prawdopodobnie nieobsługiwanej wersji, nie można ustalić wersji w pliku wykonywalnym "%1". - - - Clang Static Analyzer: Running with unsupported version %1, supported version is %2. - Statyczny analizator Clang: uruchomienie z użyciem nieobsługiwanej wersji %1. Obsługiwaną wersją jest %2. - - - Clang Static Analyzer: Failed to create temporary dir, stop. - Statyczny analizator Clang: nie można utworzyć tymczasowego katalogu, zakończono pracę. - - - Analyzing - Analiza - - - Clang Static Analyzer stopped by user. - Statyczny analizator Clang zatrzymany przez użytkownika. - - - Analyzing "%1". - Analiza "%1". - - - Failed to analyze "%1": %2 - Nie można przeanalizować "%1": %2 - - - Clang Static Analyzer finished: Processed %1 files successfully, %2 failed. - Statyczny analizator Clang zakończył pracę: przetworzono pomyślnie %1 plików, %2 plików nie udało się przetworzyć. - - - Clang Static Analyzer: Not all files could be analyzed. - Statyczny analizator Clang: nie udało się przeanalizować wszystkich plików. - - - - ClangStaticAnalyzer::Internal::ClangStaticAnalyzerRunControlFactory - - The project configuration changed since the start of the Clang Static Analyzer. Please re-run with current configuration. - Konfiguracja projektu zmieniła się od czasu uruchomienia statycznego analizatora Clang. Uruchom ponownie analizator z bieżącą konfiguracją. - - ClangStaticAnalyzer::Internal::DummyRunConfiguration @@ -38853,6 +38656,14 @@ Ustaw prawdziwy plik wykonywalny Clang. Default display name for the cmake make step. Wersja CMake + + Qt Creator needs a CMake Tool set up to build. Configure a CMake Tool in the kit options. + Qt Creator wymaga do budowania ustawionego narzędzia CMake, które można skonfigurować w ustawieniach zestawu narzędzi. + + + There is a CMakeCache.txt file in "%1", which suggest an in-source build was done before. You are now building in "%2", and the CMakeCache.txt file might confuse CMake. + Plik CMakeCache.txt istnieje w katalogu ze źródłami "%1", co sugeruje, że został tam uprzednio zbudowany projekt. Aktualnie budowanie projektu jest wykonywane w "%2" i plik CMakeCache.txt może uniemożliwić poprawne jego zbudowanie. + Persisting CMake state... Trwały stan CMake... @@ -38861,6 +38672,12 @@ Ustaw prawdziwy plik wykonywalny Clang. Running CMake in preparation to build... Uruchamianie CMake'a przed właściwym budowaniem... + + Error parsing CMake: %1 + + Błąd parsowania QMake: %1 + + CMakeProjectManager::CMakeBuildStep @@ -38868,10 +38685,6 @@ Ustaw prawdziwy plik wykonywalny Clang. The build configuration is currently disabled. Konfiguracja budowania aktualnie wyłączona. - - Qt Creator needs a CMake Tool set up to build. Configure a CMake Tool in the kit options. - Qt Creator wymaga do budowania ustawionego narzędzia CMake, które można skonfigurować w ustawieniach zestawu narzędzi. - CMakeProjectManager::Internal::CMakeBuildStepConfigWidget @@ -39065,7 +38878,7 @@ Ustaw prawdziwy plik wykonywalny Clang. Kit value: %1 - + Wartość zestawu narzędzi: %1 Setting @@ -39223,8 +39036,8 @@ Ustaw prawdziwy plik wykonywalny Clang. Utils::DebuggerMainWindow - Views - Widoki + &Views + &Widoki Toolbar @@ -39243,53 +39056,6 @@ Ustaw prawdziwy plik wykonywalny Clang. Stop - - Debugger::AnalyzerAction - - Cannot start %1 without a project. Please open the project and try again. - Nie można uruchomić %1 bez projektu. Otwórz projekt i spróbuj ponownie. - - - Debug - Debug - - - Profile - Profil - - - Release - Release - - - in Debug mode - w trybie Debug - - - in Profile mode - w trybie Profile - - - in Release mode - w trybie Release - - - with debug symbols (Debug or Profile mode) - z symbolami debugowymi (tryb Debug lub Profile) - - - on optimized code (Profile or Release mode) - z kodem zoptymalizowanym (tryb Profile lub Release) - - - Run %1 in %2 Mode? - Uruchomić %1 w trybie %2? - - - <html><head/><body><p>You are trying to run the tool "%1" on an application in %2 mode. The tool is designed to be used %3.</p><p>Run-time characteristics differ significantly between optimized and non-optimized binaries. Analytical findings for one mode may or may not be relevant for the other.</p><p>Running tools that need debug symbols on binaries that don't provide any may lead to missing function names or otherwise insufficient output.</p><p>Do you want to continue and run the tool in %2 mode?</p></body></html> - - - Debugger::Internal::WatchItem @@ -39470,13 +39236,6 @@ Czy nadpisać go? Clang - - QmlProfiler::Internal::QmlProfilerRunControlFactory - - No executable file to launch. - Brak pliku do uruchomienia. - - QmlProfiler::Internal::QmlProfilerStatisticsMainView @@ -39487,10 +39246,6 @@ Czy nadpisać go? Main Program Główny program - - %1 / %2% of total in recursive calls - - <bytecode> <kod bajtowy> @@ -39519,6 +39274,10 @@ Czy nadpisać go? Binding Wiązanie + + +%1 in recursive calls + +%1 w wywołaniach rekurencyjnych + JavaScript JavaScript @@ -40196,6 +39955,10 @@ po naciśnięciu klawisza backspace Artistic Style Styl Artistic + + &Artistic Style + Styl &Artistic + Beautifier::Internal::ClangFormat::ClangFormat @@ -40203,6 +39966,10 @@ po naciśnięciu klawisza backspace ClangFormat ClangFormat + + &ClangFormat + &ClangFormat + Beautifier::Internal::ClangFormat::ClangFormatSettings @@ -40215,7 +39982,11 @@ po naciśnięciu klawisza backspace Beautifier::Internal::Uncrustify::Uncrustify Uncrustify - + Uncrustify + + + &Uncrustify + &Uncrustify @@ -40429,13 +40200,6 @@ Komunikat: Nim - - NimSnippetProvider - - Nim - Nim - - Nim::NimBuildConfigurationFactory @@ -40609,6 +40373,10 @@ w ścieżce. QmlProfiler::Internal::FlameGraphModel + + Could not re-read events from temporary trace file. + + Compile Kompilacja @@ -41191,12 +40959,36 @@ w ścieżce. Perf Perf + + XML output recommended as it avoids parsing issues, while plain text is more human readable. + +Warning: Plain text output is missing some information (e.g. duration) + W celu uniknięcia kłopotów przy parsowaniu, zalecane jest używanie XML jako formatu wyjściowego, podczas gdy zwykły format tekstowy poprawia jedynie czytelność. + +Uwaga: podczas używania zwykłego formatu tekstowego może brakować niektórych informacji, takich jak np. czas trwania. + + + Use XML output + Używaj XML na wyjściu + + + Verbose benchmarks + + + + Log every signal emission and resulting slot invocations. + Loguj każdą emisję sygnału i każde wywołanie slotu pobudzonego sygnałem. + + + Log signals and slots + Loguj sygnały i sloty + QmlDesigner::AddNewBackendDialog Add New C++ Backend - + Dodaj nowy back-end C++ Type @@ -41545,7 +41337,7 @@ w ścieżce. Failed to forward ping pong ports. Reason: %1. - + Nie można przesłać portów ping pong. Przyczyna: %1. Failed to forward QML debugging ports. Reason: %1. @@ -41696,13 +41488,6 @@ w ścieżce. Błąd modelu kodu - - CMakeProjectManager::Internal::CMakeSnippetProvider - - CMake - CMake - - CppIndexer @@ -42021,17 +41806,6 @@ Wskakiwanie do wnętrza modułu lub ustawianie pułapek w plikach powinno dział Skonfiguruj projekt - - ProjectExplorer::TaskHub - - Error - Błąd - - - Warning - Ostrzeżenie - - QbsProjectManager::Internal::DefaultPropertyProvider @@ -42071,7 +41845,7 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Local - + Lokalny @@ -42277,14 +42051,14 @@ Zmień konfigurację zestawu narzędzi lub wybierz mkspec qmake'a pasujący Errors(%1) / Warnings(%2) / Info(%3) Błędy (%1) / Ostrzeżenia (%2) / Informacje (%3) - - Export To File - Wyeksportuj do pliku - CSV files (*.csv) Pliki CSV (*.csv) + + Export to File + Wyeksportuj do pliku + Export Failed Błąd eksportowania @@ -42590,6 +42364,10 @@ Wiersz: %4, kolumna: %5 Zoom to State Powiększ do stanu + + Re-Layout + Rozmieść ponownie + Relayout Rozmieść ponownie @@ -42984,6 +42762,174 @@ Wiersz: %4, kolumna: %5 Ask about devices not in developer mode Pytaj o urządzenia nie będące w trybie deweloperskim + + Devices + Urządzenia + + + Simulator + Symulator + + + Rename a simulator device. + Zmienia nazwę symulatora. + + + Rename + Zmień nazwę + + + Delete simulator devices. + Usuwa symulatory. + + + Delete + Usuń + + + Reset contents and settings of simulator devices. + Resetuje zawartości i ustawienia symulatorów. + + + Reset + Reset + + + Screenshot directory: + Katalog ze zrzutami ekranu: + + + Create a new simulator device. + Tworzy nowy symulator. + + + Create + Utwórz + + + Start simulator devices. + Uruchamia symulator. + + + Start + Uruchom + + + Screenshot + Zrzut ekranu + + + You are trying to launch %n simulators simultaneously. This will take significant system resources. Do you really want to continue? + + Próba uruchomienia %n symulatora. To w znacznym stopniu wyczerpie zasoby systemu. Czy kontynuować? + Próba uruchomienia %n symulatorów jednocześnie. To w znacznym stopniu wyczerpie zasoby systemu. Czy kontynuować? + Próba uruchomienia %n symulatorów jednocześnie. To w znacznym stopniu wyczerpie zasoby systemu. Czy kontynuować? + + + + Simulator Start + Uruchomienie symulatora + + + Starting simulator devices... + + Uruchamianie symulatora... + Uruchamianie symulatorów... + Uruchamianie symulatorów... + + + + Cannot start simulator (%1, %2) in current state: %3 + Nie można uruchomić symulatora (%1, %2) w bieżącym stanie: %3 + + + simulator start + uruchomienie symulatora + + + Creating simulator device... + Tworzenie symulatora... + + + Simulator device (%1) created. +UDID: %2 + Utworzono symulator (%1). +UDID: %2 + + + Simulator device (%1) creation failed. +Error: %2 + Błąd tworzenia symulatora (%1). +Błąd: %2 + + + Do you really want to reset the contents and settings of the selected devices? + + Czy zresetować zawartość i ustawienia w zaznaczonym urządzeniu? + Czy zresetować zawartości i ustawienia w zaznaczonych urządzeniach? + Czy zresetować zawartości i ustawienia w zaznaczonych urządzeniach? + + + + Resetting contents and settings... + Resetowanie zawartości i ustawień... + + + simulator reset + reset symulatora + + + Rename %1 + Zmień nazwę %1 + + + Enter new name: + Wprowadź nową nazwę: + + + Renaming simulator device... + Zmienianie nazwy symulatora... + + + simulator rename + zmiana nazwy symulatora + + + Delete Device + Usuń urządzenie + + + Do you really want to delete the selected devices? + + Czy usunąć zaznaczone urządzenie? + Czy usunąć zaznaczone urządzenia? + Czy usunąć zaznaczone urządzenia? + + + + Deleting simulator devices... + + usuwanie zaznaczonego urządzenia... + usuwanie zaznaczonych urządzeń... + usuwanie zaznaczonych urządzeń... + + + + simulator delete + usuwanie urządzenia + + + Capturing screenshots from devices... + + Pobieranie zrzutów ekranu z urządzenia... + Pobieranie zrzutów ekranu z urządzeń... + Pobieranie zrzutów ekranu z urządzeń... + + + + simulator screenshot + pobieranie zrzutów ekranu + QmlJSEditor::Internal::QmlJsEditingSettingsPage @@ -43199,7 +43145,7 @@ Wiersz: %4, kolumna: %5 Keystore - + Magazyn kluczy Certificate @@ -43207,7 +43153,7 @@ Wiersz: %4, kolumna: %5 Enter keystore password - + Podaj hasło magazynu kluczy Enter certificate password @@ -43286,7 +43232,7 @@ Wiersz: %4, kolumna: %5 Beautifier::Internal::Uncrustify::UncrustifyOptionsPageWidget Uncrustify file (*.cfg) - + Plik uncrustify (*.cfg) @@ -43360,7 +43306,7 @@ Wiersz: %4, kolumna: %5 CMakeTargetNode Target type: - Typ docelowy: + Typ docelowy: No build artifacts @@ -43373,6 +43319,11 @@ Wiersz: %4, kolumna: %5 CMakeProjectManager::Internal::CMakeProjectPlugin + + CMake + SnippetProvider + CMake + Build Zbuduj @@ -43487,8 +43438,12 @@ Wiersz: %4, kolumna: %5 Konfiguracja "%1" - <Source Directory> - <Katalog źródeł> + Parsing of CMake project failed: Connection to CMake server lost. + Błąd parsowania projektu CMake. Utracono połączenie z serwerem CMake. + + + Starting to parse CMake project for Qt Creator. + Rozpoczęcie parsowania projektu CMake dla Qt Creatora. <Build Directory> @@ -43498,6 +43453,14 @@ Wiersz: %4, kolumna: %5 <Other Locations> <Inne położenia> + + CMake Project was parsed successfully. + Parsowanie projektu CMake poprawnie zakończone. + + + CMake Project parsing failed. + Nie można sparsować projektu CMake. + <Headers> <Nagłówki> @@ -43808,17 +43771,6 @@ Termin wygaśnięcia: %3 projekt - - ProjectExplorer::SimpleRunControl - - %1 crashed. - %1 przerwał pracę. - - - %1 exited with code %2 - %1 zakończone kodem %2 - - ProjectExplorer::ToolChainManager @@ -43947,7 +43899,7 @@ Termin wygaśnięcia: %3 QmlDesigner::NodeInstanceView Qt Quick emulation layer crashed. - Warstwa emulacji Qt Quick przerwała pracę + Warstwa emulacji Qt Quick przerwała pracę. @@ -44040,8 +43992,8 @@ Termin wygaśnięcia: %3 SilverSearcher::FindInFilesSilverSearcher - SilverSearcher is not available on system - Brak dostępnego SilverSearcher w systemie + Silver Searcher is not available on the system. + Brak dostępnego Silver Searchera w systemie. @@ -44093,4 +44045,602 @@ Termin wygaśnięcia: %3 Przewodnik użytkownika + + AdbCommandsWidget + + Widget + Widżet + + + + Android::Internal::AndroidRunConfigurationWidget + + Form + Formularz + + + Activity manager start options: + + + + If the "am start" options conflict, the application might not start. + + + + Shell commands to run on Android device before application launch. + + + + Shell commands to run on Android device after application quits. + + + + Android run settings + Ustawienia uruchamiania Androida + + + + Form + + Form + Formularz + + + + Ios::Internal::CreateSimulatorDialog + + Create Simulator + Utwórz symulator + + + Simulator name: + Nazwa symulatora: + + + Device type: + Typ urządzenia: + + + OS version: + Wersja OS: + + + None + Brak + + + + Ios::Internal::SimulatorOperationDialog + + Simulator Operation Status + Stan operacji symulatora + + + %1, %2 +Operation %3 completed successfully. + %1, %2 +Operacja %3 poprawnie zakończona. + + + %1, %2 +Operation %3 failed. +UDID: %4 +Error: %5 + %1, %2 +Operacja %3 niepoprawnie zakończona. +UDID: %4 +Błąd: %5 + + + Unknown + Nieznany + + + Done. + Zakończone. + + + + QbsProjectManager::Internal::QbsInstallStepConfigWidget + + Install root: + Korzeń instalacji: + + + Flags: + Flagi: + + + Dry run + Na sucho + + + Keep going + Ignoruj błędy + + + Remove first + + + + Equivalent command line: + Zastępcza linia komend: + + + <b>Qbs:</b> %1 + <b>Qbs:</b> %1 + + + + QSsh::Internal::SshAgent + + Cannot connect to ssh-agent: SSH_AUTH_SOCK is not set. + Brak połączenia z ssh-agentem: nie ustawiono SSH_AUTH_SOCK. + + + Lost connection to ssh-agent for unknown reason. + Utracono połączenie z ssh-agentem z niewiadomego powodu. + + + ssh-agent failed to retrieve keys. + ssh-agent nie może pobrać kluczy. + + + Protocol error when talking to ssh-agent. + Błąd protokołu w trakcie komunikacji z ssh-agentem. + + + + Utils::FileSaverBase + + File Error + Błąd pliku + + + + Utils::SaveFile + + File might be locked. + Plik może być zablokowany. + + + + Beautifier::Internal::ArtisticStyle::ArtisticStyleOptionsPageWidget + + AStyle (*.astylerc) + AStyle (*.astylerc) + + + + ClangStaticAnalyzer::Internal::ClangStaticAnalyzerToolRunner + + Clang Static Analyzer + Statyczny analizator Clang + + + Clang Static Analyzer stopped by user. + Statyczny analizator Clang zatrzymany przez użytkownika. + + + The project configuration changed since the start of the Clang Static Analyzer. Please re-run with current configuration. + Konfiguracja projektu zmieniła się od czasu uruchomienia statycznego analizatora Clang. Uruchom ponownie analizator z bieżącą konfiguracją. + + + Running Clang Static Analyzer on %1 + Uruchamianie statycznego analizatora Clang na %1 + + + Clang Static Analyzer: Invalid executable "%1", stop. + Statyczny analizator Clang: niepoprawny plik wykonywalny "%1", zakończono pracę. + + + Clang Static Analyzer: Running with possibly unsupported version, could not determine version from executable "%1". + Statyczny analizator Clang: uruchomienie z użyciem prawdopodobnie nieobsługiwanej wersji, nie można ustalić wersji w pliku wykonywalnym "%1". + + + Clang Static Analyzer: Running with unsupported version %1, supported version is %2. + Statyczny analizator Clang: uruchomienie z użyciem nieobsługiwanej wersji %1. Obsługiwaną wersją jest %2. + + + Clang Static Analyzer: Failed to create temporary dir, stop. + Statyczny analizator Clang: nie można utworzyć tymczasowego katalogu, zakończono pracę. + + + Analyzing + Analiza + + + Analyzing "%1". + Analiza "%1". + + + Failed to analyze "%1": %2 + Nie można przeanalizować "%1": %2 + + + Clang Static Analyzer finished: Processed %1 files successfully, %2 failed. + Statyczny analizator Clang zakończył pracę: przetworzono pomyślnie %1 plików, %2 plików nie udało się przetworzyć. + + + Clang Static Analyzer: Not all files could be analyzed. + Statyczny analizator Clang: nie udało się przeanalizować wszystkich plików. + + + + Core::LocatorManager + + <type here> + <wpisz tutaj> + + + + BreakHandler + + Breakpoint + Pułapka + + + + Debugger::DebuggerRunTool + + No executable specified. + Nie podano pliku wykonywalnego. + + + Debugger + Debugger + + + &Show this message again. + &Pokazuj ten komunikat ponownie. + + + Debugging starts + Rozpoczęto debugowanie + + + Debugging has failed + Błąd debugowania + + + Debugging has finished + Zakończono debugowanie + + + Close Debugging Session + Zakończ sesję debugową + + + A debugging session is still in progress. Terminating the session in the current state can leave the target in an inconsistent state. Would you still like to terminate it? + Trwa sesja debugowa. Zakończenie jej w teraz może spowodować, że program znajdzie się w niespójnym stanie. Czy zakończyć ją? + + + Debugged executable + Debugowany program + + + + Debugger::GdbServerPortsGatherer + + Checking available ports... + Sprawdzanie dostępnych portów... + + + Found %1 free ports + Znaleziono %1 wolnych portów + + + Not enough free ports on device for C++ debugging. + Niewystarczająca ilość wolnych portów w urządzeniu do debugowania C++. + + + Not enough free ports on device for QML debugging. + Niewystarczająca ilość wolnych portów w urządzeniu do debugowania QML. + + + + Debugger::GdbServerRunner + + Starting gdbserver... + Uruchamianie gdbserver... + + + + Gerrit::Internal::GerritRemoteChooser + + Refresh Remote Servers + Odśwież zdalne serwery + + + Fallback + Zastępczy + + + + Ios::Internal::IosRunSupport + + Starting remote process. + Uruchamianie zdalnego procesu. + + + + Ios::Internal::IosQmlProfilerSupport + + Could not get necessary ports for the profiler connection. + + + + + Ios::Internal::SimulatorInfoModel + + UDID: %1 + UDID: %1 + + + Simulator Name + Nazwa symulatora + + + Runtime + + + + Current State + Bieżący stan + + + + ModelEditor::Internal::ElementTasks + + Update Include Dependencies + Uaktualnij zależności + + + + Nim::NimPlugin + + Nim + SnippetProvider + Nim + + + + ProjectExplorer::PortsGatherer + + Checking available ports... + Sprawdzanie dostępnych portów... + + + Found %1 free ports + Znaleziono %1 wolnych portów + + + + ProjectExplorer::Internal::RunControlPrivate + + Unexpected run control state %1 when worker %2 started. + + + + + TaskHub + + Error + Błąd + + + Warning + Ostrzeżenie + + + + ProjectExplorer::SimpleTargetRunner + + %1 crashed. + %1 przerwał pracę. + + + %2 exited with code %1 + %2 zakończone kodem %1 + + + + ProjectExplorer::Internal::RunWorkerPrivate + + Worker start timed out. + + + + Worker stop timed out. + + + + + ProjectExplorer::RunWorker + + The process failed to start. + Błąd uruchamiania procesu. + + + An unknown error in the process occurred. + Wystąpił nieznany błąd w procesie. + + + Either the invoked program "%1" is missing, or you may have insufficient permissions to invoke the program. + Albo brak programu "%1", albo brak uprawnień do jego wykonania. + + + The process was ended forcefully. + Wymuszono zakończenie procesu. + + + An error occurred when attempting to write to the process. For example, the process may not be running, or it may have closed its input channel. + Wystąpił błąd podczas próby pisania do procesu. Być może proces nie jest uruchomiony lub zamknął on swój kanał wejściowy. + + + An error occurred when attempting to read from the process. For example, the process may not be running. + Wystąpił błąd podczas próby czytania z procesu. Być może proces nie jest uruchomiony. + + + + QbsProjectManager::Internal::QbsInstallStep + + Qbs Install + Qbs Install + + + + QbsProjectManager::Internal::QbsInstallStepFactory + + Qbs Install + Qbs Install + + + + QbsProjectManager::Internal::ConfigWidget + + Change... + Zmień... + + + + QbsProjectManager::Internal::QbsKitInformation + + Additional Qbs Profile Settings + Dodatkowe ustawienia profilu Qbs + + + + QmlDesigner::NavigatorTreeView + + Invalid Id + Niepoprawny identyfikator + + + %1 is an invalid id. + %1 nie jest poprawnym identyfikatorem. + + + %1 already exists. + %1 już istnieje. + + + + QmlJSHoverHandler + + Library at %1 + Biblioteka w %1 + + + Dumped plugins successfully. + Wtyczki poprawnie zrzucone. + + + Read typeinfo files successfully. + Pliki typeinfo poprawnie odczytane. + + + + Qnx::Internal::QnxQmlProfilerSupport + + Preparing remote side... + Przygotowywanie zdalnej strony... + + + + RemoteLinux::FifoGatherer + + Creating remote socket... + Tworzenie zdalnych gniazd... + + + Created fifo: %1 + Utworzono fifo: %1 + + + + RemoteLinux::RemoteLinuxPerfSupport + + FIFO for profiling data could not be created. + Nie można utworzyć FIFO dla danych profilowania. + + + + TextEditorWidgetPrivate + + Other annotations: + Inne adnotacje: + + + + Valgrind::Internal::CallgrindToolRunner + + Profiling + Profilowanie + + + Profiling %1 + Profilowanie %1 + + + Parsing Profile Data... + Parsowanie danych profilera... + + + + Valgrind::Internal::MemcheckToolRunner + + Analyzing Memory + Analiza pamięci + + + + Valgrind::Internal::ValgrindToolRunner + + Valgrind options: %1 + Opcje valgrinda: %1 + + + Working directory: %1 + Katalog roboczy: %1 + + + Command line arguments: %1 + Argumenty linii komend: %1 + + + Analyzing finished. + Zakończono analizę. + + + Error: "%1" could not be started: %2 + Błąd: nie można uruchomić "%1": %2 + + + Error: no Valgrind executable set. + Błąd: nie ustawiono pliku wykonywalnego valgrind. + + + Process terminated. + Zakończono proces. + + + + Valgrind::ValgrindRunner + + XmlServer on %1: + XmlServer na %1: + + + LogServer on %1: + LogServer na %1: + + + + VcsBase::VcsBaseDiffEditorControllerPrivate + + Processing diff + Przetwarzanie różnic + + From 36256d6e0c3b641e14a0ec023929242bfb9f2de9 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 9 Nov 2017 14:45:04 +0100 Subject: [PATCH 04/17] Remove outdated installer creation script and resources It is no longer used (it is using same scripts as Qt now), and contains outdated resources. Change-Id: I0576d694ef16ced49303dfc4d6075b742dbcc3b1 Reviewed-by: Iikka Eklund Reviewed-by: Leena Miettinen Reviewed-by: Orgad Shaneh --- dist/installer/ifw/config/background.png | Bin 8572 -> 0 bytes dist/installer/ifw/config/config-linux.xml.in | 16 - dist/installer/ifw/config/config-mac.xml.in | 16 - .../ifw/config/config-windows.xml.in | 16 - dist/installer/ifw/config/logo.png | Bin 2439 -> 0 bytes dist/installer/ifw/config/watermark.png | Bin 7657 -> 0 bytes .../meta/LICENSE.GPL3-EXCEPT | 704 ------------------ .../meta/associatecommonfiletypesform.ui | 51 -- .../meta/installscript.qs | 225 ------ .../meta/launchqtcreatorcheckboxform.ui | 34 - .../meta/package.xml.in | 19 - .../meta/package.xml.in | 9 - qtcreator.pro | 19 +- scripts/packageIfw.py | 155 ---- 14 files changed, 1 insertion(+), 1263 deletions(-) delete mode 100644 dist/installer/ifw/config/background.png delete mode 100644 dist/installer/ifw/config/config-linux.xml.in delete mode 100644 dist/installer/ifw/config/config-mac.xml.in delete mode 100644 dist/installer/ifw/config/config-windows.xml.in delete mode 100644 dist/installer/ifw/config/logo.png delete mode 100644 dist/installer/ifw/config/watermark.png delete mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.GPL3-EXCEPT delete mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/associatecommonfiletypesform.ui delete mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs delete mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui delete mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in delete mode 100644 dist/installer/ifw/packages/org.qtproject.qtcreator/meta/package.xml.in delete mode 100755 scripts/packageIfw.py diff --git a/dist/installer/ifw/config/background.png b/dist/installer/ifw/config/background.png deleted file mode 100644 index 6819e274b39870632ce125436928c5ed6ded1561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8572 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 - - Qt Creator - {version} - Qt Creator {display_version} - Qt Project - http://www.qt.io - - logo.png - watermark.png - 520 - QtCreatorUninstaller - - @homeDir@/qtcreator-{display_version} - /opt/qtcreator-{display_version} - diff --git a/dist/installer/ifw/config/config-mac.xml.in b/dist/installer/ifw/config/config-mac.xml.in deleted file mode 100644 index c7e28b41de2..00000000000 --- a/dist/installer/ifw/config/config-mac.xml.in +++ /dev/null @@ -1,16 +0,0 @@ - - - Qt Creator - {version} - Qt Creator {display_version} - Qt Project - http://www.qt.io - - logo.png - background.png - 560 - Uninstall Qt Creator - - @homeDir@/Applications/Qt Creator {display_version} - true - diff --git a/dist/installer/ifw/config/config-windows.xml.in b/dist/installer/ifw/config/config-windows.xml.in deleted file mode 100644 index 584d67c5efb..00000000000 --- a/dist/installer/ifw/config/config-windows.xml.in +++ /dev/null @@ -1,16 +0,0 @@ - - - Qt Creator - {version} - Qt Creator {display_version} - Qt Project - http://www.qt.io - - logo.png - watermark.png - 560 - QtCreatorUninst - - @rootDir@/Qt/qtcreator-{display_version} - Qt Creator - diff --git a/dist/installer/ifw/config/logo.png b/dist/installer/ifw/config/logo.png deleted file mode 100644 index 38c0aa5d03eee041ac1332bd822dc654c2bd1413..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2439 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 MUHx3vIVCg!032n|Q~&?~ diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.GPL3-EXCEPT b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.GPL3-EXCEPT deleted file mode 100644 index b1cb1bec78a..00000000000 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/LICENSE.GPL3-EXCEPT +++ /dev/null @@ -1,704 +0,0 @@ -This is the GNU General Public License version 3, annotated with The -Qt Company GPL Exception 1.0: - -------------------------------------------------------------------------- - -The Qt Company GPL Exception 1.0 - -Exception 1: - -As a special exception you may create a larger work which contains the -output of this application and distribute that work under terms of your -choice, so long as the work is not otherwise derived from or based on -this application and so long as the work does not in itself generate -output that contains the output from this application in its original -or modified form. - -Exception 2: - -As a special exception, you have permission to combine this application -with Plugins licensed under the terms of your choice, to produce an -executable, and to copy and distribute the resulting executable under -the terms of your choice. However, the executable must be accompanied -by a prominent notice offering all users of the executable the entire -source code to this application, excluding the source code of the -independent modules, but including any changes you have made to this -application, under the terms of this license. - - -------------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/associatecommonfiletypesform.ui b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/associatecommonfiletypesform.ui deleted file mode 100644 index 5c9646c44f3..00000000000 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/associatecommonfiletypesform.ui +++ /dev/null @@ -1,51 +0,0 @@ - - - AssociateCommonFiletypesForm - - - - 0 - 0 - 557 - 35 - - - - Form - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - <html><body>Associate common file types (.c/.h, .cc/.hh, .cxx/.hxx, .c++/.h++, .cpp/.hpp) with Qt Creator.</body></html> - - - Associate common file types with Qt Creator. - - - true - - - - - - - - diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs deleted file mode 100644 index ce9591de0dc..00000000000 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs +++ /dev/null @@ -1,225 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt SDK. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -// constructor -function Component() -{ - component.loaded.connect(this, Component.prototype.loaded); - installer.installationFinished.connect(this, Component.prototype.installationFinishedPageIsShown); - installer.finishButtonClicked.connect(this, Component.prototype.installationFinished); - installer.setDefaultPageVisible(QInstaller.ComponentSelection, false); -} - -Component.prototype.loaded = function() -{ - try { - if (installer.value("os") == "win" && installer.isInstaller()) - installer.addWizardPageItem(component, "AssociateCommonFiletypesForm", QInstaller.TargetDirectory); - } catch(e) { - print(e); - } -} - -Component.prototype.createOperationsForArchive = function(archive) -{ - // if there are additional plugin 7zips, these must be extracted in .app/Contents on OS X - if (systemInfo.productType !== "osx" || archive.indexOf('qtcreator.7z') !== -1) - component.addOperation("Extract", archive, "@TargetDir@"); - else - component.addOperation("Extract", archive, "@TargetDir@/Qt Creator.app/Contents"); -} - -Component.prototype.beginInstallation = function() -{ - component.qtCreatorBinaryPath = installer.value("TargetDir"); - - if (installer.value("os") == "win") { - component.qtCreatorBinaryPath = component.qtCreatorBinaryPath + "\\bin\\qtcreator.exe"; - component.qtCreatorBinaryPath = component.qtCreatorBinaryPath.replace(/\//g, "\\"); - } - else if (installer.value("os") == "x11") - component.qtCreatorBinaryPath = component.qtCreatorBinaryPath + "/bin/qtcreator"; - else if (installer.value("os") == "mac") - component.qtCreatorBinaryPath = component.qtCreatorBinaryPath + "/Qt Creator.app/Contents/MacOS/Qt Creator"; - - if ( installer.value("os") === "win" ) - component.setStopProcessForUpdateRequest(component.qtCreatorBinaryPath, true); -} - -registerCommonWindowsFileTypeExtensions = function() -{ - var headerExtensions = new Array("h", "hh", "hxx", "h++", "hpp"); - - for (var i = 0; i < headerExtensions.length; ++i) { - component.addOperation( "RegisterFileType", - headerExtensions[i], - component.qtCreatorBinaryPath + " -client \"%1\"", - "C++ Header file", - "text/plain", - component.qtCreatorBinaryPath + ",3", - "ProgId=QtProject.QtCreator." + headerExtensions[i]); - } - - var cppExtensions = new Array("cc", "cxx", "c++", "cp", "cpp"); - - for (var i = 0; i < cppExtensions.length; ++i) { - component.addOperation( "RegisterFileType", - cppExtensions[i], - component.qtCreatorBinaryPath + " -client \"%1\"", - "C++ Source file", - "text/plain", - component.qtCreatorBinaryPath + ",2", - "ProgId=QtProject.QtCreator." + cppExtensions[i]); - } - - component.addOperation( "RegisterFileType", - "c", - component.qtCreatorBinaryPath + " -client \"%1\"", - "C Source file", - "text/plain", - component.qtCreatorBinaryPath + ",1", - "ProgId=QtProject.QtCreator.c"); -} - -registerWindowsFileTypeExtensions = function() -{ - component.addOperation( "RegisterFileType", - "ui", - component.qtCreatorBinaryPath + " -client \"%1\"", - "Qt UI file", - "text/plain", - component.qtCreatorBinaryPath + ",4", - "ProgId=QtProject.QtCreator.ui"); - component.addOperation( "RegisterFileType", - "pro", - component.qtCreatorBinaryPath + " \"%1\"", - "Qt Project file", - "text/plain", - component.qtCreatorBinaryPath + ",5", - "ProgId=QtProject.QtCreator.pro"); - component.addOperation( "RegisterFileType", - "pri", - component.qtCreatorBinaryPath + " -client \"%1\"", - "Qt Project Include file", - "text/plain", - component.qtCreatorBinaryPath + ",6", - "ProgId=QtProject.QtCreator.pri"); - component.addOperation( "RegisterFileType", - "qbs", - component.qtCreatorBinaryPath + " \"%1\"", - "Qbs Project file", - "text/plain", - component.qtCreatorBinaryPath + ",5", - "ProgId=QtProject.QtCreator.qbs"); - component.addOperation( "RegisterFileType", - "qs", - component.qtCreatorBinaryPath + " -client \"%1\"", - "Qt Script file", - "text/plain", - component.qtCreatorBinaryPath + ",0", - "ProgId=QtProject.QtCreator.qs"); - component.addOperation( "RegisterFileType", - "qml", - component.qtCreatorBinaryPath + " -client \"%1\"", - "Qt Quick Markup language file", - "text/plain", - component.qtCreatorBinaryPath + ",7", - "ProgId=QtProject.QtCreator.qml"); -} - -Component.prototype.createOperations = function() -{ - // Call the base createOperations and afterwards set some registry settings - component.createOperations(); - if ( installer.value("os") == "win" ) - { - component.addOperation( "CreateShortcut", - component.qtCreatorBinaryPath, - "@StartMenuDir@/Qt Creator " + installer.value("ProductVersion") + ".lnk", - "workingDirectory=@homeDir@" ); - - // only install c runtime if it is needed, no minor version check of the c runtime till we need it - if (installer.value("HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\12.0\\VC\\Runtimes\\x86\\Installed") != 1) { - // return value 3010 means it need a reboot, but in most cases it is not needed for run Qt application - // return value 5100 means there's a newer version of the runtime already installed - component.addElevatedOperation("Execute", "{0,1638,3010,5100}", "@TargetDir@\\lib\\vcredist_msvc2013\\vcredist_x86.exe", "/norestart", "/q"); - } - - registerWindowsFileTypeExtensions(); - - if (component.userInterface("AssociateCommonFiletypesForm").AssociateCommonFiletypesCheckBox - .checked) { - registerCommonWindowsFileTypeExtensions(); - } - } - if ( installer.value("os") == "x11" ) - { - component.addOperation( "InstallIcons", "@TargetDir@/share/icons" ); - component.addOperation( "CreateDesktopEntry", - "QtProject-qtcreator.desktop", - "Type=Application\nExec=" + component.qtCreatorBinaryPath + "\nPath=@TargetDir@\nName=Qt Creator\nGenericName=The IDE of choice for Qt development.\nGenericName[de]=Die IDE der Wahl zur Qt Entwicklung\nIcon=QtProject-qtcreator\nTerminal=false\nCategories=Development;IDE;Qt;\nMimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;" - ); - } -} - -function isRoot() -{ - if (installer.value("os") == "x11" || installer.value("os") == "mac") - { - var id = installer.execute("/usr/bin/id", new Array("-u"))[0]; - id = id.replace(/(\r\n|\n|\r)/gm,""); - if (id === "0") - { - return true; - } - } - return false; -} - -Component.prototype.installationFinishedPageIsShown = function() -{ - isroot = isRoot(); - try { - if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isroot) { - installer.addWizardPageItem( component, "LaunchQtCreatorCheckBoxForm", QInstaller.InstallationFinished ); - } - } catch(e) { - print(e); - } -} - -Component.prototype.installationFinished = function() -{ - try { - if (component.installed && installer.isInstaller() && installer.status == QInstaller.Success && !isroot) { - var isLaunchQtCreatorCheckBoxChecked = component.userInterface("LaunchQtCreatorCheckBoxForm").launchQtCreatorCheckBox.checked; - if (isLaunchQtCreatorCheckBoxChecked) - installer.executeDetached(component.qtCreatorBinaryPath, new Array(), "@homeDir@"); - } - } catch(e) { - print(e); - } -} - diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui deleted file mode 100644 index 4d6060c67ac..00000000000 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/launchqtcreatorcheckboxform.ui +++ /dev/null @@ -1,34 +0,0 @@ - - - LaunchQtCreatorCheckBoxForm - - - - 0 - 0 - 112 - 17 - - - - - 0 - - - - - Launch Qt Creator - - - true - - - false - - - - - - - - diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in b/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in deleted file mode 100644 index a59d5f9eb62..00000000000 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in +++ /dev/null @@ -1,19 +0,0 @@ - - - Qt Creator Application - The IDE of choice for Qt development. - {version} - {date} - org.qtproject.qtcreator.application - - - - - true - true - org.qtproject.qtcreator - - associatecommonfiletypesform.ui - launchqtcreatorcheckboxform.ui - - diff --git a/dist/installer/ifw/packages/org.qtproject.qtcreator/meta/package.xml.in b/dist/installer/ifw/packages/org.qtproject.qtcreator/meta/package.xml.in deleted file mode 100644 index 122ca71cad4..00000000000 --- a/dist/installer/ifw/packages/org.qtproject.qtcreator/meta/package.xml.in +++ /dev/null @@ -1,9 +0,0 @@ - - - Qt Creator - Installs the Qt Creator IDE. - {version} - {date} - org.qtproject.qtcreator - - diff --git a/qtcreator.pro b/qtcreator.pro index f3ba4d7af8d..b5f48709cd0 100644 --- a/qtcreator.pro +++ b/qtcreator.pro @@ -20,11 +20,6 @@ DISTFILES += dist/copyright_template.txt \ $$files(dist/changes-*) \ qtcreator.qbs \ qbs/pluginjson/pluginjson.qbs \ - $$files(dist/installer/ifw/config/config-*) \ - dist/installer/ifw/packages/org.qtproject.qtcreator/meta/package.xml.in \ - dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/installscript.qs \ - dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/package.xml.in \ - dist/installer/ifw/packages/org.qtproject.qtcreator.application/meta/license.txt \ $$files(scripts/*.py) \ $$files(scripts/*.sh) \ $$files(scripts/*.pl) @@ -102,9 +97,6 @@ else: PLATFORM = "unknown" BASENAME = $$(INSTALL_BASENAME) isEmpty(BASENAME): BASENAME = qt-creator-$${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX) -macx:INSTALLER_NAME = "qt-creator-$${QTCREATOR_VERSION}" -else:INSTALLER_NAME = "$${BASENAME}" - linux { appstream.files = dist/org.qt-project.qtcreator.appdata.xml appstream.path = $$QTC_PREFIX/share/metainfo/ @@ -150,20 +142,11 @@ isEmpty(INSTALLER_ARCHIVE_FROM_ENV) { bindist.commands = 7z a -mx9 $$OUT_PWD/$${BASENAME}.7z \"$$BINDIST_SOURCE\" #bindist_installer.depends = deployqt bindist_installer.commands = 7z a -mx9 $${INSTALLER_ARCHIVE} \"$$BINDIST_INSTALLER_SOURCE\" -installer.depends = bindist_installer -installer.commands = python -u $$PWD/scripts/packageIfw.py -i \"$(IFW_PATH)\" -v $${QTCREATOR_VERSION} -a \"$${INSTALLER_ARCHIVE}\" "$$INSTALLER_NAME" - -macx { - codesign_installer.commands = codesign -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${INSTALLER_NAME}.app\" - dmg_installer.commands = hdiutil create -srcfolder "$${INSTALLER_NAME}.app" -volname \"Qt Creator\" -format UDBZ "$${BASENAME}-installer.dmg" -ov -scrub -size 1g -verbose - QMAKE_EXTRA_TARGETS += codesign_installer dmg_installer -} win32 { deployqt.commands ~= s,/,\\\\,g bindist.commands ~= s,/,\\\\,g bindist_installer.commands ~= s,/,\\\\,g - installer.commands ~= s,/,\\\\,g } -QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer installer +QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer diff --git a/scripts/packageIfw.py b/scripts/packageIfw.py deleted file mode 100755 index 7a38204311d..00000000000 --- a/scripts/packageIfw.py +++ /dev/null @@ -1,155 +0,0 @@ -#!/usr/bin/env python - -############################################################################ -# -# Copyright (C) 2016 The Qt Company Ltd. -# Contact: https://www.qt.io/licensing/ -# -# This file is part of Qt Creator. -# -# Commercial License Usage -# Licensees holding valid commercial Qt licenses may use this file in -# accordance with the commercial license agreement provided with the -# Software or, alternatively, in accordance with the terms contained in -# a written agreement between you and The Qt Company. For licensing terms -# and conditions see https://www.qt.io/terms-conditions. For further -# information use the contact form at https://www.qt.io/contact-us. -# -# GNU General Public License Usage -# Alternatively, this file may be used under the terms of the GNU -# General Public License version 3 as published by the Free Software -# Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -# included in the packaging of this file. Please review the following -# information to ensure the GNU General Public License requirements will -# be met: https://www.gnu.org/licenses/gpl-3.0.html. -# -############################################################################ - -import os -import sys -import datetime -import getopt -import subprocess -import fnmatch -import tempfile -import shutil -import inspect - -def usage(): - print('Usage: %s [-v|--version-string=versionstring] [-d|--display-version=versionstring] [-i|--installer-path=/path/to/installerfw] [-a|--archive=archive.7z] [--debug] ' % os.path.basename(sys.argv[0])) - -def substitute_file(infile, outfile, substitutions): - with open(infile, 'r') as f: - template = f.read() - with open(outfile, 'w') as f: - f.write(template.format(**substitutions)) - -def ifw_template_dir(): - script_dir = os.path.dirname(inspect.getfile(inspect.currentframe())) - source_dir = os.path.normpath(os.path.join(script_dir, '..')) - return os.path.normpath(os.path.join(source_dir, 'dist', 'installer', 'ifw')) - -def main(): - try: - opts, args = getopt.gnu_getopt(sys.argv[1:], 'hv:d:i:a:', ['help', 'version-string=', 'display-version=', 'installer-path=', 'archive', 'debug']) - except: - usage() - sys.exit(2) - - if len(args) < 1: - usage() - sys.exit(2) - - version = '' - display_version = '' - ifw_location = '' - archives = [] - debug = False - for o, a in opts: - if o in ['-h', '--help']: - usage() - sys.exit(0) - if o in ['-v', '--version-string']: - version = a - if o in ['-d', '--display-version']: - display_version = a - if o in ['-i', '--installer-path']: - ifw_location = a - if o in ['-a', '--archive']: - archives.append(a) - if o in ['--debug']: - debug = True - - if (version == ''): - raise Exception('Version not specified (--version-string)!') - - if not display_version: - display_version = version - - if (ifw_location == ''): - raise Exception('Installer framework location not specified (--installer-path)!') - - if not archives: - raise ValueError('No archive(s) specified (--archive)!') - - installer_name = args[0] - config_postfix = '' - if sys.platform == 'darwin': - config_postfix = '-mac' - if sys.platform.startswith('win'): - config_postfix = '-windows' - if sys.platform.startswith('linux'): - config_postfix = '-linux' - installer_name = installer_name + '.run' - - config_name = 'config' + config_postfix + '.xml' - - try: - temp_dir = tempfile.mkdtemp() - except: - raise IOError('Failed to create a temporary directory!') - - if debug: - print('Working directory: {0}'.format(temp_dir)) - try: - substs = {} - substs['version'] = version - substs['display_version'] = display_version - substs['date'] = datetime.date.today().isoformat() - substs['archives'] = ','.join(archives) - - template_dir = ifw_template_dir() - out_config_dir = os.path.join(temp_dir,'config') - out_packages_dir = os.path.join(temp_dir, 'packages') - - shutil.copytree(os.path.join(template_dir, 'packages'), os.path.join(temp_dir, 'packages')) - shutil.copytree(os.path.join(template_dir, 'config'), os.path.join(temp_dir, 'config')) - - for root, dirnames, filenames in os.walk(out_packages_dir): - for template in fnmatch.filter(filenames, '*.in'): - substitute_file(os.path.join(root, template), os.path.join(root, template[:-3]), substs) - os.remove(os.path.join(root, template)) - - for root, dirnames, filenames in os.walk(out_config_dir): - for template in fnmatch.filter(filenames, '*.in'): - substitute_file(os.path.join(root, template), os.path.join(root, template[:-3]), substs) - os.remove(os.path.join(root, template)) - - data_path = os.path.join(out_packages_dir, 'org.qtproject.qtcreator.application', 'data') - if not os.path.exists(data_path): - os.makedirs(data_path) - for archive in archives: - shutil.copy(archive, data_path) - - ifw_call = [os.path.join(ifw_location, 'bin', 'binarycreator'), '-c', os.path.join(out_config_dir, config_name), '-p', out_packages_dir, installer_name, '--offline-only' ] - if debug: - ifw_call.append('-v') - subprocess.check_call(ifw_call, stderr=subprocess.STDOUT) - finally: - if not debug: - print('Cleaning up...') - shutil.rmtree(temp_dir) - print('Done.') - -if __name__ == '__main__': - main() From ee540da42e6dfcaaab115cf6e465868fa7130c38 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 7 Dec 2017 09:53:47 +0100 Subject: [PATCH 05/17] QmakePM: Avoid calling function on nullptr Task-number: QTCREATORBUG-19419 Change-Id: Iaac597b947ca505819674eec0a862158dce8a632 Reviewed-by: Tobias Hunger --- src/plugins/qmakeprojectmanager/qmakeproject.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index a2fb3f9fba6..dedf9534b94 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -668,7 +668,8 @@ QtSupport::ProFileReader *QmakeProject::createProFileReader(const QmakeProFile * } else { // Set up a better default environment without using a build configuration: QmakeBuildConfiguration::setupBuildEnvironment(k, env); - k->addToEnvironment(env); + if (k) + k->addToEnvironment(env); } QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k); From 1ddee692009975d89b36c51cf5e30808776e38e3 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Fri, 1 Dec 2017 13:00:53 +0100 Subject: [PATCH 06/17] WinRT: fix saving changed deployment steps Explicitly connect ui elements to slots. Change-Id: I1235f29a1596636dffc943c276da4a251deca884 Reviewed-by: hjk --- .../winrt/winrtpackagedeploymentstepwidget.cpp | 11 +++++------ src/plugins/winrt/winrtpackagedeploymentstepwidget.h | 3 +-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/plugins/winrt/winrtpackagedeploymentstepwidget.cpp b/src/plugins/winrt/winrtpackagedeploymentstepwidget.cpp index c7ef43bda00..c7198717b5d 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstepwidget.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstepwidget.cpp @@ -38,6 +38,10 @@ WinRtPackageDeploymentStepWidget::WinRtPackageDeploymentStepWidget(WinRtPackageD m_ui->setupUi(this); m_ui->leArguments->setText(m_step->winDeployQtArguments()); m_ui->btnRestoreDefaultArgs->setIcon(Utils::Icons::RESET.icon()); + connect(m_ui->btnRestoreDefaultArgs, &QToolButton::pressed, + this, &WinRtPackageDeploymentStepWidget::restoreDefaultArguments); + connect(m_ui->leArguments, &QLineEdit::textChanged, + m_step, &WinRtPackageDeploymentStep::setWinDeployQtArguments); } WinRtPackageDeploymentStepWidget::~WinRtPackageDeploymentStepWidget() @@ -55,15 +59,10 @@ QString WinRtPackageDeploymentStepWidget::displayName() const return m_step->displayName(); } -void WinRtPackageDeploymentStepWidget::on_btnRestoreDefaultArgs_clicked() +void WinRtPackageDeploymentStepWidget::restoreDefaultArguments() { m_ui->leArguments->setText(m_step->defaultWinDeployQtArguments()); } -void WinRtPackageDeploymentStepWidget::on_leArguments_textChanged(QString str) -{ - m_step->setWinDeployQtArguments(str); -} - } // namespace Internal } // namespace WinRt diff --git a/src/plugins/winrt/winrtpackagedeploymentstepwidget.h b/src/plugins/winrt/winrtpackagedeploymentstepwidget.h index 31a30aaff6a..2a7f92f6467 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstepwidget.h +++ b/src/plugins/winrt/winrtpackagedeploymentstepwidget.h @@ -45,8 +45,7 @@ public: virtual QString displayName() const; private: - void on_btnRestoreDefaultArgs_clicked(); - void on_leArguments_textChanged(QString str); + void restoreDefaultArguments(); Ui::WinRtPackageDeploymentStepWidget *m_ui; WinRtPackageDeploymentStep *m_step; From 7df3bff07ad07913744f0dcf4bddf3905bb3d9ba Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 7 Dec 2017 13:10:36 +0100 Subject: [PATCH 07/17] ProjectExplorer: Make subscriptions more robust Make sure not to continue to connect after the receiver was destructed and make sure to disconnect from everything when that happens. Task-number: QTCREATORBUG-19391 Change-Id: I4d09a7dca2a5260c3d4744607dccbde5964a0623 Reviewed-by: Eike Ziller --- src/plugins/projectexplorer/subscription.cpp | 54 +++++++++++++++----- src/plugins/projectexplorer/subscription.h | 4 ++ 2 files changed, 44 insertions(+), 14 deletions(-) diff --git a/src/plugins/projectexplorer/subscription.cpp b/src/plugins/projectexplorer/subscription.cpp index b878bdacdcf..6049fea02a3 100644 --- a/src/plugins/projectexplorer/subscription.cpp +++ b/src/plugins/projectexplorer/subscription.cpp @@ -30,6 +30,7 @@ #include "target.h" #include +#include namespace ProjectExplorer { namespace Internal { @@ -37,42 +38,42 @@ namespace Internal { Subscription::Subscription(const Subscription::Connector &s, const QObject *receiver, QObject *parent) : QObject(parent), m_subscriber(s) { - if (receiver != parent) - connect(receiver, &QObject::destroyed, this, &QObject::deleteLater); + if (receiver != parent) { + connect(receiver, &QObject::destroyed, this, [this]() { + unsubscribeAll(); + m_subscriber = Connector(); // Reset subscriber + deleteLater(); + }); + } } Subscription::~Subscription() { - for (const auto &c : Utils::asConst(m_connections)) - disconnect(c); + unsubscribeAll(); } void Subscription::subscribe(ProjectConfiguration *pc) { if (!m_subscriber) return; - QMetaObject::Connection conn = m_subscriber(pc); - if (conn) - m_connections.insert(pc, conn); + + connectTo(pc); if (auto p = qobject_cast(pc)) { for (Target *t : p->targets()) { for (ProjectConfiguration *pc : t->projectConfigurations()) - m_subscriber(pc); + connectTo(pc); } } else if (auto t = qobject_cast(pc)) { for (ProjectConfiguration *pc : t->projectConfigurations()) - m_subscriber(pc); + connectTo(pc); } } void Subscription::unsubscribe(ProjectConfiguration *pc) { - auto c = m_connections.value(pc); - if (c) { - disconnect(c); - m_connections.remove(pc); - } + disconnectFrom(pc); + if (auto p = qobject_cast(pc)) { for (Target *t : p->targets()) { for (ProjectConfiguration *pc : t->projectConfigurations()) @@ -82,7 +83,32 @@ void Subscription::unsubscribe(ProjectConfiguration *pc) for (ProjectConfiguration *pc : t->projectConfigurations()) unsubscribe(pc); } +} +void Subscription::unsubscribeAll() +{ + for (const auto &c : Utils::asConst(m_connections)) + disconnect(c); + m_connections.clear(); +} + +void Subscription::connectTo(ProjectConfiguration *pc) +{ + QTC_ASSERT(!m_connections.contains(pc), return); + + QMetaObject::Connection conn = m_subscriber(pc); + if (conn) + m_connections.insert(pc, conn); +} + +void Subscription::disconnectFrom(ProjectConfiguration *pc) +{ + auto c = m_connections.value(pc); + if (!c) + return; + + disconnect(c); + m_connections.remove(pc); } ProjectSubscription::ProjectSubscription(const Subscription::Connector &s, const QObject *r, diff --git a/src/plugins/projectexplorer/subscription.h b/src/plugins/projectexplorer/subscription.h index 5c1e0ec1a46..819a11d1f16 100644 --- a/src/plugins/projectexplorer/subscription.h +++ b/src/plugins/projectexplorer/subscription.h @@ -53,6 +53,10 @@ protected: void subscribe(ProjectConfiguration *pc); void unsubscribe(ProjectConfiguration *pc); + void unsubscribeAll(); + void connectTo(ProjectConfiguration *pc); + void disconnectFrom(ProjectConfiguration *pc); + Connector m_subscriber; QHash m_connections; }; From a53df3892a70f99910cfd085f2f2feca9e17d081 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 1 Dec 2017 15:26:27 +0100 Subject: [PATCH 08/17] Qt Quick Application wizards: No AA_EnableHighDpiScaling on Simulator Avoid setting Qt::AA_EnableHighDpiScaling when running in the simulator. Simulator detection is done by testing whether environment variable QTGLESSTREAM_DISPLAY is set. This amends 8c3bd6159436d099127bd9cbb8271be8e18f95a5 where all platforms except Windows were excluded from setting the flag. Task-number: QTBUG-64815 Change-Id: I8ab7ba9f24217915dc1d01e1f2eb5c37923c5504 Reviewed-by: Eike Ziller Reviewed-by: Rainer Keller --- .../wizards/projects/qtquickapplication/main.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/main.cpp b/share/qtcreator/templates/wizards/projects/qtquickapplication/main.cpp index 500db3de63c..986dcd606f1 100644 --- a/share/qtcreator/templates/wizards/projects/qtquickapplication/main.cpp +++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/main.cpp @@ -2,18 +2,20 @@ %{JS: QtSupport.qtIncludes([], ["QtGui/QGuiApplication", "QtQml/QQmlApplicationEngine"])} int main(int argc, char *argv[]) { -@if %{SetQPAPhysicalSize} - qputenv("QT_QPA_EGLFS_PHYSICAL_WIDTH", QByteArray("213")); - qputenv("QT_QPA_EGLFS_PHYSICAL_HEIGHT", QByteArray("120")); - -@endif @if %{UseVirtualKeyboard} qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); @endif -#if defined(Q_OS_WIN) +@if %{SetQPAPhysicalSize} + if (qEnvironmentVariableIsEmpty("QTGLESSTREAM_DISPLAY")) { + qputenv("QT_QPA_EGLFS_PHYSICAL_WIDTH", QByteArray("213")); + qputenv("QT_QPA_EGLFS_PHYSICAL_HEIGHT", QByteArray("120")); + + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + } +@else QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); -#endif +@endif QGuiApplication app(argc, argv); From 44c02b52a3b12b0ed2485ce38ad824bec9764a97 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 11 Dec 2017 14:48:00 +0100 Subject: [PATCH 09/17] QmlDesigner: Enable clipping in FormEditorItem When resizing an item the instanceIsRenderPixmap can be bigger than the bounding rect. In this case we get painting artefacts. Change-Id: I6da43f16a1e85d045a0ebbb01db594979ad89622 Reviewed-by: Tim Jenssen --- .../qmldesigner/components/formeditor/formeditoritem.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp index 1fa95273ff4..54d5d1536dc 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp @@ -338,6 +338,9 @@ void FormEditorItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *, if (isInStackedContainer) showPlaceHolder = qmlItemNode().instanceIsRenderPixmapNull() && isContentVisible(); + painter->setClipRegion(m_boundingRect.toRect()); + painter->setClipping(true); + if (!hideCompletely) { if (showPlaceHolder) { if (scene()->showBoundingRects() && m_boundingRect.width() > 15 && m_boundingRect.height() > 15) From 372d37d40af813b77507c69eb955b9517c5d978b Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Mon, 11 Dec 2017 14:51:05 +0100 Subject: [PATCH 10/17] QmlDesigner: Do not show bounding rectangles by default The bounding rectangles can be confusing and break WYSIWYG. Therefore we disable them by default. Change-Id: I3713e668b916607670255715e0d41f76a789b34e Reviewed-by: Alessandro Portale Reviewed-by: Tim Jenssen --- .../qmldesigner/components/formeditor/formeditorscene.cpp | 2 +- .../qmldesigner/components/formeditor/formeditorwidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp index 3601db17535..be6437c8985 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorscene.cpp @@ -51,7 +51,7 @@ namespace QmlDesigner { FormEditorScene::FormEditorScene(FormEditorWidget *view, FormEditorView *editorView) : QGraphicsScene(), m_editorView(editorView), - m_showBoundingRects(true) + m_showBoundingRects(false) { setupScene(); view->setScene(this); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 3c2b516746c..abb2c828c8a 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -107,7 +107,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) m_showBoundingRectAction->setShortcut(Qt::Key_A); m_showBoundingRectAction->setShortcutContext(Qt::WidgetWithChildrenShortcut); m_showBoundingRectAction->setCheckable(true); - m_showBoundingRectAction->setChecked(true); + m_showBoundingRectAction->setChecked(false); m_showBoundingRectAction->setIcon(Utils::Icons::BOUNDING_RECT.icon()); addAction(m_showBoundingRectAction.data()); From 5ca3f52b4b3607bad0053ff0ec530387a7d4d4b9 Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 11 Dec 2017 17:27:01 +0100 Subject: [PATCH 11/17] Squish: Fix property name ...to the correct capitalization. Squish < 6.3 could handle both, whereas Squish >= 6.3 is more strict. Change-Id: I9864518e21d3f2ed44fe7527f75aa958dc0081de Reviewed-by: Christian Stenger --- tests/system/suite_HELP/tst_HELP02/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_HELP/tst_HELP02/test.py b/tests/system/suite_HELP/tst_HELP02/test.py index e3fc68cb405..9332268cc9b 100755 --- a/tests/system/suite_HELP/tst_HELP02/test.py +++ b/tests/system/suite_HELP/tst_HELP02/test.py @@ -73,7 +73,7 @@ def setKeyboardShortcutForAboutQtC(): clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Keyboard") filter = waitForObject("{container={title='Keyboard Shortcuts' type='QGroupBox' unnamed='1' " "visible='1'} type='Utils::FancyLineEdit' unnamed='1' visible='1' " - "placeHolderText='Filter'}") + "placeholderText='Filter'}") replaceEditorContent(filter, "about") treewidget = waitForObject("{type='QTreeWidget' unnamed='1' visible='1'}") modelIndex = waitForObject("{column='0' text='AboutQtCreator' type='QModelIndex' " @@ -84,7 +84,7 @@ def setKeyboardShortcutForAboutQtC(): record = waitForObject("{container=%s type='Core::Internal::ShortcutButton' unnamed='1' " "visible='1' text~='(Stop Recording|Record)'}" % shortcutGB) shortcut = ("{container=%s type='Utils::FancyLineEdit' unnamed='1' visible='1' " - "placeHolderText='Enter key sequence as text'}" % shortcutGB) + "placeholderText='Enter key sequence as text'}" % shortcutGB) clickButton(record) nativeType("") clickButton(record) From aaa65375f948bc170f24aa431e3eeae0beeffb4e Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Mon, 11 Dec 2017 13:31:46 +0100 Subject: [PATCH 12/17] Squish: Remove some more expected lines from tst_opencreator_qbs Change-Id: I2b56b24044e0c057dbe5aff1b7f9a1fdcfdeb6c2 Reviewed-by: Christian Stenger --- .../tst_opencreator_qbs/testdata/projecttree_creator.tsv | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv index d69465eed0b..cfade2719bf 100644 --- a/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv +++ b/tests/system/suite_general/tst_opencreator_qbs/testdata/projecttree_creator.tsv @@ -12588,13 +12588,6 @@ "diff.qbs:3" "3" "Differ autotest" "3" "differ.qbs:3" "4" -"standard pch file (gui)" "4" -"QtcProduct.qbs:58" "5" -"qtcreator_gui_pch.h" "6" -"standard pch file (non-gui)" "4" -"QtcProduct.qbs:50" "5" -"qtcreator_pch.h" "6" -"tst_differ.cpp" "4" "Environment autotest" "2" "environment.qbs:3" "3" "standard pch file (gui)" "3" From 1772808592bee4ba781f20915aacf4a859f02c25 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 12 Dec 2017 09:03:45 +0100 Subject: [PATCH 13/17] Debugger: use inferior device when run tool device is null Task-number: QTCREATORBUG-19442 Change-Id: I6c2419b30bf86af79bb2436dc6dc8196f6c65f06 Reviewed-by: David Schulz Reviewed-by: hjk --- src/plugins/debugger/gdb/gdbengine.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp index e48becbc71e..d87c33a7414 100644 --- a/src/plugins/debugger/gdb/gdbengine.cpp +++ b/src/plugins/debugger/gdb/gdbengine.cpp @@ -759,7 +759,11 @@ void GdbEngine::interruptInferior() showMessage("TRYING TO INTERRUPT INFERIOR"); if (HostOsInfo::isWindowsHost() && !m_isQnxGdb) { QTC_ASSERT(state() == InferiorStopRequested, qDebug() << state(); notifyInferiorStopFailed()); - DeviceProcessSignalOperation::Ptr signalOperation = runTool()->device()->signalOperation(); + IDevice::ConstPtr device = runTool()->device(); + if (!device) + device = runParameters().inferior.device; + QTC_ASSERT(device, notifyInferiorStopFailed(); return); + DeviceProcessSignalOperation::Ptr signalOperation = device->signalOperation(); QTC_ASSERT(signalOperation, notifyInferiorStopFailed(); return); connect(signalOperation.data(), &DeviceProcessSignalOperation::finished, this, [this, signalOperation](const QString &error) { From 5e4b6d54b2440bc180fb534f84b93fd213058ab1 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 11 Dec 2017 09:33:11 +0100 Subject: [PATCH 14/17] sdktool: Use shell_quote for data path define Change-Id: Idc0e2945133123941afa0ab92e5ff57dedf8f4ba Reviewed-by: Iikka Eklund Reviewed-by: Eike Ziller --- src/tools/sdktool/sdktool.pro | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tools/sdktool/sdktool.pro b/src/tools/sdktool/sdktool.pro index b41ec7a9499..21673297520 100644 --- a/src/tools/sdktool/sdktool.pro +++ b/src/tools/sdktool/sdktool.pro @@ -78,6 +78,6 @@ appversion.output = $$OUT_PWD/app/app_version.h QMAKE_SUBSTITUTES += appversion INCLUDEPATH += $$OUT_PWD -macx:DEFINES += "DATA_PATH=\"\\\".\\\"\"" -else:win32:DEFINES += "DATA_PATH=\"\\\"../share/qtcreator\\\"\"" -else:DEFINES += "DATA_PATH=\"\\\"../../share/qtcreator\\\"\"" +macos:DEFINES += $$shell_quote(DATA_PATH=\".\") +else:win32:DEFINES += $$shell_quote(DATA_PATH=\"../share/qtcreator\") +else:DEFINES += $$shell_quote(DATA_PATH=\"../../share/qtcreator\") From 09ff10871db7a77af7d647af3da1c75e469bbe91 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 11 Dec 2017 09:41:20 +0100 Subject: [PATCH 15/17] Make sdktool default data path overridable at build time By setting a relative path in SDKTOOL_DATA_PATH Change-Id: Ib61921f396f4eaf72fa240c3edb3795fda800609 Reviewed-by: Iikka Eklund Reviewed-by: Eike Ziller --- src/tools/sdktool/sdktool.pro | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/tools/sdktool/sdktool.pro b/src/tools/sdktool/sdktool.pro index 21673297520..d3d1babf2e6 100644 --- a/src/tools/sdktool/sdktool.pro +++ b/src/tools/sdktool/sdktool.pro @@ -78,6 +78,10 @@ appversion.output = $$OUT_PWD/app/app_version.h QMAKE_SUBSTITUTES += appversion INCLUDEPATH += $$OUT_PWD -macos:DEFINES += $$shell_quote(DATA_PATH=\".\") -else:win32:DEFINES += $$shell_quote(DATA_PATH=\"../share/qtcreator\") -else:DEFINES += $$shell_quote(DATA_PATH=\"../../share/qtcreator\") +isEmpty(SDKTOOL_DATA_PATH) { + macos:DEFINES += $$shell_quote(DATA_PATH=\".\") + else:win32:DEFINES += $$shell_quote(DATA_PATH=\"../share/qtcreator\") + else:DEFINES += $$shell_quote(DATA_PATH=\"../../share/qtcreator\") +} else { + DEFINES += $$shell_quote(DATA_PATH=\"$$SDKTOOL_DATA_PATH\") +} From 527fd0fa4c2330c1530e3e3928ca9358bb190cad Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 12 Dec 2017 10:31:39 +0100 Subject: [PATCH 16/17] Version bump to 4.5.1 Change-Id: Ifb5656f33cdb4370c1c654c8d98587071528a72f Reviewed-by: Eike Ziller --- qbs/modules/qtc/qtc.qbs | 4 ++-- qtcreator.pri | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index d719e527e0a..c5fe151c0cd 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,10 +4,10 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.5.0' + property string qtcreator_display_version: '4.5.1' property string ide_version_major: '4' property string ide_version_minor: '5' - property string ide_version_release: '0' + property string ide_version_release: '1' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release diff --git a/qtcreator.pri b/qtcreator.pri index afcf99ea333..a2a34565af5 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -1,10 +1,10 @@ !isEmpty(QTCREATOR_PRI_INCLUDED):error("qtcreator.pri already included") QTCREATOR_PRI_INCLUDED = 1 -QTCREATOR_VERSION = 4.5.0 +QTCREATOR_VERSION = 4.5.1 QTCREATOR_COMPAT_VERSION = 4.5.0 VERSION = $$QTCREATOR_VERSION -QTCREATOR_DISPLAY_VERSION = 4.5.0 +QTCREATOR_DISPLAY_VERSION = 4.5.1 QTCREATOR_COPYRIGHT_YEAR = 2017 BINARY_ARTIFACTS_BRANCH = master From 6e48d0cd318c964a857b83434fb7f8446307adff Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 11 Dec 2017 15:33:50 +0100 Subject: [PATCH 17/17] Adapt Qbs submodule URL It moves to qbs/qbs Developers need to run git submodule sync on existing checkouts once, to fetch the new URL Change-Id: I9d526a0df6f4a3fad56e6998880455e003e96d9a Reviewed-by: Oswald Buddenhagen Reviewed-by: Jake Petroules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9eb4a3af9d6..ee0a99fda75 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "qbs"] path = src/shared/qbs - url = ../../qt-labs/qbs.git + url = ../../qbs/qbs.git ignore = dirty