clean up OS conditionals in project files

doc/doc.pri

@@ -23,9 +23,7 @@ qch_docs.files = $$QCH_FILE
 
 unix:!macx {
     system("mkdir -p `dirname $$QCH_FILE` && touch $$QCH_FILE")
-}
 
-unix:!macx {
     qch_docs.path = /share/doc/qtcreator
     INSTALLS += qch_docs
 }

src/app/app.pro

@@ -5,29 +5,22 @@ TEMPLATE = app
 TARGET = $$IDE_APP_TARGET
 DESTDIR = $$IDE_APP_PATH
 
-
 SOURCES += main.cpp
 
 include(../rpath.pri)
 
 win32 {
-        RC_FILE = qtcreator.rc
-}
-
-macx {
-        ICON = qtcreator.icns
-        QMAKE_INFO_PLIST = Info.plist
-}
+    CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
+    else:LIBS *= -lExtensionSystem -lAggregation
 
-macx {
+    RC_FILE = qtcreator.rc
+} else:macx {
     CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
     else:LIBS *= -lExtensionSystem -lAggregation
-}
-win32 {
-    CONFIG(debug, debug|release):LIBS *= -lExtensionSystemd -lAggregationd
-    else:LIBS *= -lExtensionSystem -lAggregation
-}
-unix:!macx {
+
+    ICON = qtcreator.icns
+    QMAKE_INFO_PLIST = Info.plist
+} else {
     LIBS *= -lExtensionSystem -lAggregation
 
     target.path  = /bin

src/plugins/coreplugin/coreplugin.pro

@@ -170,9 +170,11 @@ FORMS += dialogs/newdialog.ui \
     welcomemode.ui
 RESOURCES += core.qrc \
     fancyactionbar.qrc
-linux-* { 
+
+unix:!macx {
     images.files = images/qtcreator_logo_*.png
     images.path = /share/pixmaps
     INSTALLS += images
 }
+
 OTHER_FILES += Core.pluginspec

src/qtcreatorlibrary.pri

@@ -12,7 +12,7 @@ TARGET = $$qtLibraryTarget($$TARGET)
 
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
-linux-* {
+unix:!macx {
 	target.path = /$$IDE_LIBRARY_BASENAME/qtcreator
 	INSTALLS += target
 }

src/qtcreatorplugin.pri

@@ -42,7 +42,7 @@ contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
 
 CONFIG += plugin plugin_with_soname
 
-linux-* {
+unix:!macx {
     target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
     pluginspec.files += $${TARGET}.pluginspec
     pluginspec.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER